RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-23 03:02:36 +01:00
Code Issues Projects Releases Wiki Activity

UseListOrder: Don't give constant IDs to GlobalValues

Browse Source 
Since initializers of GlobalValues are being assigned IDs before
GlobalValues themselves, explicitly exclude GlobalValues from the
constant pool.  Added targeted test in `test/Bitcode/use-list-order.ll`
and added two more RUN lines in `test/Assembly`.

This is part of PR5680.

llvm-svn: 214368
This commit is contained in:
Duncan P. N. Exon Smith 2014-07-31 00:13:28 +00:00
parent fa45d532b3
commit fba0626873
4 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Bitcode/Writer/ValueEnumerator.cpp
View File

@ -80,12 +80,15 @@ static OrderMap orderModule(const Module *M) {
// implicitly.
for (const GlobalVariable &G : M->globals())
if (G.hasInitializer())
orderValue(G.getInitializer(), OM);
if (!isa<GlobalValue>(G.getInitializer()))
orderValue(G.getInitializer(), OM);
for (const GlobalAlias &A : M->aliases())
orderValue(A.getAliasee(), OM);
if (!isa<GlobalValue>(A.getAliasee()))
orderValue(A.getAliasee(), OM);
for (const Function &F : *M)
if (F.hasPrefixData())
orderValue(F.getPrefixData(), OM);
if (!isa<GlobalValue>(F.getPrefixData()))
orderValue(F.getPrefixData(), OM);
OM.LastGlobalConstantID = OM.size();
// Initializers of GlobalValues are processed in

1
test/Assembler/ConstantExprFold.ll
View File

@ -2,6 +2,7 @@
; situations
; RUN: llvm-as < %s | llvm-dis | not grep "("
; RUN: verify-uselistorder %s -preserve-bc-use-list-order -num-shuffles=5
@A = global i64 0

1
test/Assembler/ConstantExprFoldCast.ll
View File

@ -1,6 +1,7 @@
; This test checks to make sure that constant exprs fold in some simple situations
; RUN: llvm-as < %s | llvm-dis | not grep cast
; RUN: verify-uselistorder %s -preserve-bc-use-list-order -num-shuffles=5
@A = global i32* bitcast (i8* null to i32*) ; Cast null -> fold
@B = global i32** bitcast (i32** @A to i32**) ; Cast to same type -> fold

13
test/Bitcode/use-list-order.ll
View File

@ -22,6 +22,19 @@
@globalAndFunction = global i4 4
@globalAndFunctionGlobalUser = global i4* @globalAndFunction
; Check use-list order for constants used by globals that are themselves used
; as aliases. This confirms that this globals are recognized as GlobalValues
; (not general constants).
@const.global = global i63 0
@const.global.ptr = global i63* @const.global
@const.global.2 = global i63 0
; Same as above, but for aliases.
@const.target = global i62 1
@const.alias = alias i62* @const.target
@const.alias.ptr = alias i62* @const.alias
@const.alias.2 = alias i62* @const.target
define i64 @f(i64 %f) {
entry:
%sum = add i64 %f, 0