Revert r230448, "Reland r230314 "Fix codegen for virtual methods that are (re-) exported from multiple modules."", since I have reverted r230446.

llvm-svn: 230477

4 files changed, 0 insertions, 42 deletions

diff --git a/clang/test/Modules/Inputs/merge-vtable-codegen/a.h b/clang/test/Modules/Inputs/merge-vtable-codegen/a.h
deleted file mode 100644
index c2885379aa4..00000000000
--- a/clang/test/Modules/Inputs/merge-vtable-codegen/a.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef A_H
-#define A_H
-
-struct A {
-  virtual void x();
-};
-
-#endif
diff --git a/clang/test/Modules/Inputs/merge-vtable-codegen/b.h b/clang/test/Modules/Inputs/merge-vtable-codegen/b.h
deleted file mode 100644
index 770e46077f9..00000000000
--- a/clang/test/Modules/Inputs/merge-vtable-codegen/b.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef B_H
-#define B_H
-
-#include "a.h"
-
-class B : virtual public A {
-  virtual void x() {}
-};
-
-void b(A* p) {
-  p->x();
-  // Instantiating a class that virtually inherits 'A'
-  // triggers calculation of the vtable offsets in 'A'.
-  B b;
-}
-
-#endif
diff --git a/clang/test/Modules/Inputs/merge-vtable-codegen/c.h b/clang/test/Modules/Inputs/merge-vtable-codegen/c.h
deleted file mode 100644
index 40cbbb047cb..00000000000
--- a/clang/test/Modules/Inputs/merge-vtable-codegen/c.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef C_H
-#define C_H
-
-#include "a.h"
-
-#endif
diff --git a/clang/test/Modules/Inputs/merge-vtable-codegen/merge-vtable-codegen.modulemap b/clang/test/Modules/Inputs/merge-vtable-codegen/merge-vtable-codegen.modulemap
deleted file mode 100644
index 1edaa07101f..00000000000
--- a/clang/test/Modules/Inputs/merge-vtable-codegen/merge-vtable-codegen.modulemap
+++ /dev/null
@@ -1,11 +0,0 @@
-module "a" {
-  textual header "a.h"
-}
-
-module "b" {
-  header "b.h"
-}
-
-module "c" {
-  header "c.h"
-}