The dtor CGObjCRuntime::~CGObjCRuntime() was implemented twice, once

in CGObjCGNU.cpp and once in CGObjCEtoile.cpp.  Moved its definition to
CGObjC.cpp.  This resolves a build error in Xcode, and also cleans things up.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@49429 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/CGObjC.cpp b/lib/CodeGen/CGObjC.cpp
index 7894e83c05881317f0443777fb0dae13442b2749..299698f1f38bf7ea5a134f2c072b5b2f55c9cc26 100644 (file)
--- a/lib/CodeGen/CGObjC.cpp
+++ b/lib/CodeGen/CGObjC.cpp
@@ -11,6 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "CGObjCRuntime.h"
 #include "CodeGenFunction.h"
 #include "CodeGenModule.h"
 #include "clang/AST/Expr.h"
@@ -23,4 +24,4 @@ llvm::Value *CodeGenFunction::EmitObjCStringLiteral(const ObjCStringLiteral *E){
   return CGM.GetAddrOfConstantCFString(S);
 }
 
-
+CGObjCRuntime::~CGObjCRuntime() {}

diff --git a/lib/CodeGen/CGObjCEtoile.cpp b/lib/CodeGen/CGObjCEtoile.cpp
index 74c98224ffe420dd7c4a7d39bb069f4ce6d15035..efd5fac3293c2cdf5d2faaf140a62d805e9ee564 100644 (file)
--- a/lib/CodeGen/CGObjCEtoile.cpp
+++ b/lib/CodeGen/CGObjCEtoile.cpp
@@ -17,9 +17,6 @@
 #include "llvm/Support/LLVMBuilder.h"
 #include "llvm/ADT/SmallVector.h"
 
-
-clang::CodeGen::CGObjCRuntime::~CGObjCRuntime() {}
-
 namespace {
 class CGObjCEtoile : public clang::CodeGen::CGObjCRuntime {
 private:

diff --git a/lib/CodeGen/CGObjCGNU.cpp b/lib/CodeGen/CGObjCGNU.cpp
index 9d97d475caa879bc858ef5129f47236e1fffb502..7fc3eca6cebf6ccdc5679b91087a8343054b6c50 100644 (file)
--- a/lib/CodeGen/CGObjCGNU.cpp
+++ b/lib/CodeGen/CGObjCGNU.cpp
@@ -17,9 +17,6 @@
 #include "llvm/Support/LLVMBuilder.h"
 #include "llvm/ADT/SmallVector.h"
 
-
-clang::CodeGen::CGObjCRuntime::~CGObjCRuntime() {}
-
 namespace {
 class CGObjCGNU : public clang::CodeGen::CGObjCRuntime {
 private: