OSDN Git Service
(root)
/
android-x86
/
external-llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ad3aa5e
)
We already have a reference to the TargetMachine, use that.
author
Eric Christopher
<echristo@gmail.com>
Tue, 10 Jun 2014 20:39:39 +0000
(20:39 +0000)
committer
Eric Christopher
<echristo@gmail.com>
Tue, 10 Jun 2014 20:39:39 +0000
(20:39 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210580
91177308
-0d34-0410-b5e6-
96231b3b80d8
lib/Transforms/Scalar/GlobalMerge.cpp
patch
|
blob
|
history
diff --git
a/lib/Transforms/Scalar/GlobalMerge.cpp
b/lib/Transforms/Scalar/GlobalMerge.cpp
index
dd9c378
..
16f2099
100644
(file)
--- a/
lib/Transforms/Scalar/GlobalMerge.cpp
+++ b/
lib/Transforms/Scalar/GlobalMerge.cpp
@@
-270,8
+270,7
@@
bool GlobalMerge::doInitialization(Module &M) {
continue;
if (DL->getTypeAllocSize(Ty) < MaxOffset) {
- if (TargetLoweringObjectFile::getKindForGlobal(I, TLI->getTargetMachine())
- .isBSSLocal())
+ if (TargetLoweringObjectFile::getKindForGlobal(I, *TM).isBSSLocal())
BSSGlobals[AddressSpace].push_back(I);
else if (I->isConstant())
ConstGlobals[AddressSpace].push_back(I);