Revert "Don't make assumptions about the name of private global variables."

This reverts commit r222061.

It's causing linker errors.

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

diff --git a/include/llvm/Analysis/Passes.h b/include/llvm/Analysis/Passes.h
index 10a56059ae10cd5d5ef60d5a8620c0a715e9c8ca..98f38e742f5f954db3960e9ded6c7f29154dae76 100644 (file)
--- a/include/llvm/Analysis/Passes.h
+++ b/include/llvm/Analysis/Passes.h
@@ -107,8 +107,6 @@ namespace llvm {
   //
   ImmutablePass *createObjCARCAliasAnalysisPass();
 
-  FunctionPass *createPAEvalPass();
-
   //===--------------------------------------------------------------------===//
   //
   /// createLazyValueInfoPass - This creates an instance of the LazyValueInfo

diff --git a/include/llvm/InitializePasses.h b/include/llvm/InitializePasses.h
index a4bc598e80e3a32fce8d4e3fce361ff2c0b201a7..2489882d82150cce7bd0597f5d75457650be4fee 100644 (file)
--- a/include/llvm/InitializePasses.h
+++ b/include/llvm/InitializePasses.h
@@ -211,7 +211,6 @@ void initializeObjCARCAPElimPass(PassRegistry&);
 void initializeObjCARCExpandPass(PassRegistry&);
 void initializeObjCARCContractPass(PassRegistry&);
 void initializeObjCARCOptPass(PassRegistry&);
-void initializePAEvalPass(PassRegistry &);
 void initializeOptimizePHIsPass(PassRegistry&);
 void initializePartiallyInlineLibCallsPass(PassRegistry&);
 void initializePEIPass(PassRegistry&);

diff --git a/include/llvm/LinkAllPasses.h b/include/llvm/LinkAllPasses.h
index 66e4e9c4e26b1d66c5fd2fcdf60d5b050e74ea0b..ef354f9cf50bfa586160ad8d089d6bb7153cde42 100644 (file)
--- a/include/llvm/LinkAllPasses.h
+++ b/include/llvm/LinkAllPasses.h
@@ -111,7 +111,6 @@ namespace {
       (void) llvm::createObjCARCExpandPass();
       (void) llvm::createObjCARCContractPass();
       (void) llvm::createObjCARCOptPass();
-      (void) llvm::createPAEvalPass();
       (void) llvm::createPromoteMemoryToRegisterPass();
       (void) llvm::createDemoteRegisterToMemoryPass();
       (void) llvm::createPruneEHPass();

diff --git a/lib/Analysis/Analysis.cpp b/lib/Analysis/Analysis.cpp
index 7f5797bfb3784afe7e77bce159b43eb321d77a0b..f64bf0ec2c47a5419a05f791966101a8e11b4e1f 100644 (file)
--- a/lib/Analysis/Analysis.cpp
+++ b/lib/Analysis/Analysis.cpp
@@ -68,7 +68,6 @@ void llvm::initializeAnalysis(PassRegistry &Registry) {
   initializeTargetTransformInfoAnalysisGroup(Registry);
   initializeTypeBasedAliasAnalysisPass(Registry);
   initializeScopedNoAliasAAPass(Registry);
-  initializePAEvalPass(Registry);
 }
 
 void LLVMInitializeAnalysis(LLVMPassRegistryRef R) {

diff --git a/lib/Transforms/ObjCARC/CMakeLists.txt b/lib/Transforms/ObjCARC/CMakeLists.txt
index b449fac13860041e5fd5945e448ef8a83e7fdc57..233deb398011d33ce4ef99c2ed3a99f1ea0ee3e7 100644 (file)
--- a/lib/Transforms/ObjCARC/CMakeLists.txt
+++ b/lib/Transforms/ObjCARC/CMakeLists.txt
@@ -8,7 +8,6 @@ add_llvm_library(LLVMObjCARCOpts
   ObjCARCContract.cpp
   DependencyAnalysis.cpp
   ProvenanceAnalysis.cpp
-  ProvenanceAnalysisEvaluator.cpp
   )
 
 add_dependencies(LLVMObjCARCOpts intrinsics_gen)

diff --git a/lib/Transforms/ObjCARC/ObjCARC.h b/lib/Transforms/ObjCARC/ObjCARC.h
index 7a7eae84a1e20e878ea2710f46d7c0fc67b494ec..9dddd6574f8e882d123caca58fcb8b5cdf8a40de 100644 (file)
--- a/lib/Transforms/ObjCARC/ObjCARC.h
+++ b/lib/Transforms/ObjCARC/ObjCARC.h
@@ -380,15 +380,11 @@ static inline bool IsObjCIdentifiedObject(const Value *V) {
       StringRef Name = GV->getName();
       // These special variables are known to hold values which are not
       // reference-counted pointers.
-      if (Name.startswith("\01l_objc_msgSend_fixup_"))
-        return true;
-
-      StringRef Section = GV->getSection();
-      if (Section.find("__message_refs") != StringRef::npos ||
-          Section.find("__objc_classrefs") != StringRef::npos ||
-          Section.find("__objc_superrefs") != StringRef::npos ||
-          Section.find("__objc_methname") != StringRef::npos ||
-          Section.find("__cstring") != StringRef::npos)
+      if (Name.startswith("\01L_OBJC_SELECTOR_REFERENCES_") ||
+          Name.startswith("\01L_OBJC_CLASSLIST_REFERENCES_") ||
+          Name.startswith("\01L_OBJC_CLASSLIST_SUP_REFS_$_") ||
+          Name.startswith("\01L_OBJC_METH_VAR_NAME_") ||
+          Name.startswith("\01l_objc_msgSend_fixup_"))
         return true;
     }
   }

diff --git a/lib/Transforms/ObjCARC/ProvenanceAnalysisEvaluator.cpp b/lib/Transforms/ObjCARC/ProvenanceAnalysisEvaluator.cpp
deleted file mode 100644 (file)
index d836632..0000000
--- a/lib/Transforms/ObjCARC/ProvenanceAnalysisEvaluator.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-//===- ProvenanceAnalysisEvaluator.cpp - ObjC ARC Optimization ------------===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "ProvenanceAnalysis.h"
-#include "llvm/Pass.h"
-#include "llvm/ADT/SetVector.h"
-#include "llvm/Analysis/AliasAnalysis.h"
-#include "llvm/Analysis/Passes.h"
-#include "llvm/IR/InstIterator.h"
-#include "llvm/IR/Function.h"
-#include "llvm/Support/raw_ostream.h"
-
-using namespace llvm;
-using namespace llvm::objcarc;
-
-namespace {
-class PAEval : public FunctionPass {
-
-public:
-  static char ID;
-  PAEval();
-  void getAnalysisUsage(AnalysisUsage &AU) const override;
-  bool runOnFunction(Function &F) override;
-};
-}
-
-char PAEval::ID = 0;
-PAEval::PAEval() : FunctionPass(ID) {}
-
-void PAEval::getAnalysisUsage(AnalysisUsage &AU) const {
-  AU.addRequired<AliasAnalysis>();
-}
-
-static StringRef getName(Value *V) {
-  StringRef Name = V->getName();
-  if (Name.startswith("\1"))
-    return Name.substr(1);
-  return Name;
-}
-
-static void insertIfNamed(SetVector<Value *> &Values, Value *V) {
-  if (!V->hasName())
-    return;
-  Values.insert(V);
-}
-
-bool PAEval::runOnFunction(Function &F) {
-  SetVector<Value *> Values;
-
-  for (auto &Arg : F.args())
-    insertIfNamed(Values, &Arg);
-
-  for (auto I = inst_begin(F), E = inst_end(F); I != E; ++I) {
-    insertIfNamed(Values, &*I);
-
-    for (auto &Op : I->operands())
-    insertIfNamed(Values, Op);
-  }
-
-  ProvenanceAnalysis PA;
-  PA.setAA(&getAnalysis<AliasAnalysis>());
-
-  for (Value *V1 : Values) {
-    StringRef NameV1 = getName(V1);
-    for (Value *V2 : Values) {
-      StringRef NameV2 = getName(V2);
-      if (NameV1 >= NameV2)
-        continue;
-      errs() << NameV1 << " and " << NameV2;
-      if (PA.related(V1, V2))
-        errs() << " are related.\n";
-      else
-        errs() << " are not related.\n";
-    }
-  }
-
-  return false;
-}
-
-FunctionPass *llvm::createPAEvalPass() { return new PAEval(); }
-
-INITIALIZE_PASS_BEGIN(PAEval, "pa-eval",
-                      "Evaluate ProvenanceAnalysis on all pairs", false, true)
-INITIALIZE_AG_DEPENDENCY(AliasAnalysis)
-INITIALIZE_PASS_END(PAEval, "pa-eval",
-                    "Evaluate ProvenanceAnalysis on all pairs", false, true)

diff --git a/test/Transforms/ObjCARC/provenance.ll b/test/Transforms/ObjCARC/provenance.ll
deleted file mode 100644 (file)
index 937c689..0000000
--- a/test/Transforms/ObjCARC/provenance.ll
+++ /dev/null
@@ -1,52 +0,0 @@
-; RUN: opt -disable-output -pa-eval %s 2>&1 | FileCheck %s
-
-@"\01l_objc_msgSend_fixup_" = global i8 0
-@g1 = global i8 0, section "__OBJC,__message_refs,literal_pointers,no_dead_strip"
-@g2 = global i8 0, section "__DATA, __objc_classrefs, regular, no_dead_strip"
-@g3 = global i8 0, section "__DATA, __objc_superrefs, regular, no_dead_strip"
-@g4 = global i8 0, section "__TEXT,__objc_methname,cstring_literals"
-@g5 = global i8 0, section "__TEXT,__cstring,cstring_literals"
-
-declare void @g(i8)
-
-define void @f(i8* %a, i8** %b, i8** %c) {
-  %y1 = load i8* %a
-  call void @g(i8 %y1)
-
-  %y2 = load i8** %b
-  %y3 = load i8** %c
-
-  %x0 = load i8* @"\01l_objc_msgSend_fixup_"
-  call void @g(i8 %x0)
-
-  %x1 = load i8* @g1
-  call void @g(i8 %x1)
-
-  %x2 = load i8* @g2
-  call void @g(i8 %x2)
-
-  %x3 = load i8* @g3
-  call void @g(i8 %x3)
-
-  %x4 = load i8* @g4
-  call void @g(i8 %x4)
-
-  %x5 = load i8* @g5
-  call void @g(i8 %x5)
-  ret void
-}
-
-; CHECK: y1 and y2 are related.
-; CHECK: y1 and y3 are related.
-; CHECK: y2 and y3 are related.
-; CHECK: x0 and y1 are not related.
-; CHECK: x0 and y2 are not related.
-; CHECK: x0 and y3 are not related.
-; CHECK: l_objc_msgSend_fixup_ and y1 are not related.
-; CHECK: l_objc_msgSend_fixup_ and y2 are not related.
-; CHECK: l_objc_msgSend_fixup_ and y3 are not related.
-; CHECK: x1 and y1 are not related.
-; CHECK: x2 and y1 are not related.
-; CHECK: x3 and y1 are not related.
-; CHECK: x4 and y1 are not related.
-; CHECK: x5 and y1 are not related.