Rename some GC classes so that their roll will hopefully be clearer.

[oota-llvm.git] / lib / Transforms / Utils / InlineFunction.cpp

diff --git a/lib/Transforms/Utils/InlineFunction.cpp b/lib/Transforms/Utils/InlineFunction.cpp
index a198356fd2c2e3a12b9f25757f74138f09c56cac..fe82073442f9f251e4b7b68a56814c9a57a2a8e7 100644 (file)
--- a/lib/Transforms/Utils/InlineFunction.cpp
+++ b/lib/Transforms/Utils/InlineFunction.cpp
@@ -208,10 +208,10 @@ bool llvm::InlineFunction(CallSite CS, CallGraph *CG, const TargetData *TD) {
   //  1. If the caller has no GC, then the callee's GC must be propagated to the
   //     caller.
   //  2. If the caller has a differing GC, it is invalid to inline.
-  if (CalledFunc->hasCollector()) {
-    if (!Caller->hasCollector())
-      Caller->setCollector(CalledFunc->getCollector());
-    else if (CalledFunc->getCollector() != Caller->getCollector())
+  if (CalledFunc->hasGC()) {
+    if (!Caller->hasGC())
+      Caller->setGC(CalledFunc->getGC());
+    else if (CalledFunc->getGC() != Caller->getGC())
       return false;
   }