[modules] Don't clobber a destructor's operator delete when adding another one;

move the operator delete updating into a separate update record so we can cope
with updating another module's destructor's operator delete.

llvm-svn: 231735

4 files changed, 9 insertions, 0 deletions

diff --git a/clang/test/Modules/Inputs/cxx-dtor/a.h b/clang/test/Modules/Inputs/cxx-dtor/a.h
new file mode 100644
index 00000000000..023606eb35a
--- /dev/null
+++ b/clang/test/Modules/Inputs/cxx-dtor/a.h
@@ -0,0 +1 @@
+struct X { X(); virtual ~X(); };
diff --git a/clang/test/Modules/Inputs/cxx-dtor/b.h b/clang/test/Modules/Inputs/cxx-dtor/b.h
new file mode 100644
index 00000000000..75958564cc9
--- /dev/null
+++ b/clang/test/Modules/Inputs/cxx-dtor/b.h
@@ -0,0 +1,3 @@
+struct X { X(); virtual ~X(); };
+inline X::~X() {}
+#include "a.h"
diff --git a/clang/test/Modules/Inputs/cxx-dtor/module.modulemap b/clang/test/Modules/Inputs/cxx-dtor/module.modulemap
new file mode 100644
index 00000000000..61578a1865a
--- /dev/null
+++ b/clang/test/Modules/Inputs/cxx-dtor/module.modulemap
@@ -0,0 +1,2 @@
+module a { header "a.h" export * }
+module b { header "b.h" export * }
diff --git a/clang/test/Modules/cxx-dtor.cpp b/clang/test/Modules/cxx-dtor.cpp
new file mode 100644
index 00000000000..ead67ec334e
--- /dev/null
+++ b/clang/test/Modules/cxx-dtor.cpp
@@ -0,0 +1,3 @@
+// RUN: rm -rf %t
+// RUN: %clang_cc1 -fmodules -x c++ -std=c++11 -fmodules-cache-path=%t -I %S/Inputs/cxx-dtor -emit-llvm-only %s
+#include "b.h"