mirror of
https://github.com/RPCSX/llvm.git
synced 2025-01-26 06:14:42 +00:00
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
This commit is contained in:
Reid Kleckner
parent
be11bdfe20
commit
bfabc8f8c5
@ -107,8 +107,6 @@ namespace llvm {
|
||||
//
|
||||
ImmutablePass *createObjCARCAliasAnalysisPass();
|
||||
|
||||
FunctionPass *createPAEvalPass();
|
||||
|
||||
//===--------------------------------------------------------------------===//
|
||||
//
|
||||
/// createLazyValueInfoPass - This creates an instance of the LazyValueInfo
|
||||
|
||||
@ -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&);
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -68,7 +68,6 @@ void llvm::initializeAnalysis(PassRegistry &Registry) {
|
||||
initializeTargetTransformInfoAnalysisGroup(Registry);
|
||||
initializeTypeBasedAliasAnalysisPass(Registry);
|
||||
initializeScopedNoAliasAAPass(Registry);
|
||||
initializePAEvalPass(Registry);
|
||||
}
|
||||
|
||||
void LLVMInitializeAnalysis(LLVMPassRegistryRef R) {
|
||||
|
||||
@ -8,7 +8,6 @@ add_llvm_library(LLVMObjCARCOpts
|
||||
ObjCARCContract.cpp
|
||||
DependencyAnalysis.cpp
|
||||
ProvenanceAnalysis.cpp
|
||||
ProvenanceAnalysisEvaluator.cpp
|
||||
)
|
||||
|
||||
add_dependencies(LLVMObjCARCOpts intrinsics_gen)
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@ -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)
|
||||
@ -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.
|
||||
Loading…
x
Reference in New Issue
Block a user