Skip to content

Commit

Permalink
Remove support for using "foo" as symbols instead of %"foo". This is …
Browse files Browse the repository at this point in the history 
…ancient

syntax and has been long obsolete.  As usual, updating the tests is the nasty
part of this.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@133242 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
@lattner
lattner committed Jun 17, 2011
1 parent ec324e5 commit 7a1b9bd
Show file tree
Hide file tree
Showing 17 changed files with 14 additions and 75 deletions.
13 changes: 3 additions & 10 deletions lib/AsmParser/LLParser.cpp
View file
Expand Up @@ -165,7 +165,6 @@ bool LLParser::ParseTopLevelEntities() {
case lltok::kw_deplibs: if (ParseDepLibs()) return true; break;
case lltok::kw_type: if (ParseUnnamedType()) return true; break;
case lltok::LocalVarID: if (ParseUnnamedType()) return true; break;
case lltok::StringConstant: // FIXME: REMOVE IN LLVM 3.0
case lltok::LocalVar: if (ParseNamedType()) return true; break;
case lltok::GlobalID: if (ParseUnnamedGlobal()) return true; break;
case lltok::GlobalVar: if (ParseNamedGlobal()) return true; break;
Expand Down Expand Up @@ -1353,7 +1352,6 @@ bool LLParser::ParseTypeRec(PATypeHolder &Result) {
return true;
break;
case lltok::LocalVar:
case lltok::StringConstant: // FIXME: REMOVE IN LLVM 3.0
// TypeRec ::= %foo
if (const Type *T = M->getTypeByName(Lex.getStrVal())) {
Result = T;
Expand Down Expand Up @@ -1513,8 +1511,7 @@ bool LLParser::ParseArgumentList(std::vector<ArgInfo> &ArgList,
if (ArgTy->isVoidTy())
return Error(TypeLoc, "argument can not have void type");

if (Lex.getKind() == lltok::LocalVar ||
Lex.getKind() == lltok::StringConstant) { // FIXME: REMOVE IN LLVM 3.0
if (Lex.getKind() == lltok::LocalVar) {
Name = Lex.getStrVal();
Lex.Lex();
}
Expand All @@ -1539,8 +1536,7 @@ bool LLParser::ParseArgumentList(std::vector<ArgInfo> &ArgList,
if (ArgTy->isVoidTy())
return Error(TypeLoc, "argument can not have void type");

if (Lex.getKind() == lltok::LocalVar ||
Lex.getKind() == lltok::StringConstant) { // FIXME: REMOVE IN LLVM 3.0
if (Lex.getKind() == lltok::LocalVar) {
Name = Lex.getStrVal();
Lex.Lex();
} else {
Expand Down Expand Up @@ -1969,7 +1965,6 @@ bool LLParser::ParseValID(ValID &ID, PerFunctionState *PFS) {
ID.Kind = ValID::t_LocalID;
break;
case lltok::LocalVar: // %foo
case lltok::StringConstant: // "foo" - FIXME: REMOVE IN LLVM 3.0
ID.StrVal = Lex.getStrVal();
ID.Kind = ValID::t_LocalName;
break;
Expand Down Expand Up @@ -2897,9 +2892,7 @@ bool LLParser::ParseBasicBlock(PerFunctionState &PFS) {
Lex.Lex();
if (ParseToken(lltok::equal, "expected '=' after instruction id"))
return true;
} else if (Lex.getKind() == lltok::LocalVar ||
// FIXME: REMOVE IN LLVM 3.0
Lex.getKind() == lltok::StringConstant) {
} else if (Lex.getKind() == lltok::LocalVar) {
NameStr = Lex.getStrVal();
Lex.Lex();
if (ParseToken(lltok::equal, "expected '=' after instruction name"))
Expand Down
22 changes: 0 additions & 22 deletions test/Analysis/BasicAA/2004-12-08-BasicAACrash.ll
View file

This file was deleted.

20 changes: 0 additions & 20 deletions test/Analysis/BasicAA/2004-12-08-BasicAACrash2.ll
View file

This file was deleted.

2 changes: 1 addition & 1 deletion test/Analysis/ScalarEvolution/SolveQuadraticEquation.ll
View file
Expand Up @@ -7,7 +7,7 @@

define void @test(i32 %N) {
entry:
"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
%"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
br label %bb3

bb: ; preds = %bb3
Expand Down
1 change: 0 additions & 1 deletion test/Analysis/ScalarEvolution/trip-count.ll
View file
Expand Up @@ -7,7 +7,6 @@

define void @test(i32 %N) {
entry:
"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
br label %bb3

bb: ; preds = %bb3
Expand Down
1 change: 0 additions & 1 deletion test/Analysis/ScalarEvolution/trip-count2.ll
View file
Expand Up @@ -7,7 +7,6 @@

define void @test(i32 %N) {
entry:
"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
br label %bb3

bb: ; preds = %bb3
Expand Down
1 change: 0 additions & 1 deletion test/CodeGen/ARM/2007-05-07-tailmerge-1.ll
View file
Expand Up @@ -12,7 +12,6 @@ entry:
%i_addr = alloca i32 ; <i32*> [#uses=2]
%q_addr = alloca i32 ; <i32*> [#uses=2]
%retval = alloca i32, align 4 ; <i32*> [#uses=1]
"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
store i32 %i, i32* %i_addr
store i32 %q, i32* %q_addr
%tmp = load i32* %i_addr ; <i32> [#uses=1]
Expand Down
1 change: 0 additions & 1 deletion test/CodeGen/ARM/2007-05-09-tailmerge-2.ll
View file
Expand Up @@ -12,7 +12,6 @@ entry:
%i_addr = alloca i32 ; <i32*> [#uses=2]
%q_addr = alloca i32 ; <i32*> [#uses=2]
%retval = alloca i32, align 4 ; <i32*> [#uses=1]
"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
store i32 %i, i32* %i_addr
store i32 %q, i32* %q_addr
%tmp = load i32* %i_addr ; <i32> [#uses=1]
Expand Down
1 change: 0 additions & 1 deletion test/CodeGen/ARM/2007-05-22-tailmerge-3.ll
View file
Expand Up @@ -14,7 +14,6 @@ entry:
%i_addr = alloca i32 ; <i32*> [#uses=2]
%q_addr = alloca i32 ; <i32*> [#uses=2]
%retval = alloca i32, align 4 ; <i32*> [#uses=1]
"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
store i32 %i, i32* %i_addr
store i32 %q, i32* %q_addr
%tmp = load i32* %i_addr ; <i32> [#uses=1]
Expand Down
1 change: 0 additions & 1 deletion test/CodeGen/ARM/vargs_align.ll
View file
Expand Up @@ -6,7 +6,6 @@ entry:
%a_addr = alloca i32 ; <i32*> [#uses=1]
%retval = alloca i32, align 4 ; <i32*> [#uses=2]
%tmp = alloca i32, align 4 ; <i32*> [#uses=2]
"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
store i32 %a, i32* %a_addr
store i32 0, i32* %tmp
%tmp1 = load i32* %tmp ; <i32> [#uses=1]
Expand Down
12 changes: 6 additions & 6 deletions test/CodeGen/Generic/2007-04-30-LandingPadBranchFolding.ll
View file
@@ -1,13 +1,13 @@
; RUN: llc < %s
; PR1228

"struct.std::basic_string<char,std::char_traits<char>,std::allocator<char> >::_Alloc_hider" = type { i8* }
"struct.std::locale" = type { "struct.std::locale::_Impl"* }
"struct.std::locale::_Impl" = type { i32, "struct.std::locale::facet"**, i32, "struct.std::locale::facet"**, i8** }
"struct.std::locale::facet" = type { i32 (...)**, i32 }
"struct.std::string" = type { "struct.std::basic_string<char,std::char_traits<char>,std::allocator<char> >::_Alloc_hider" }
%"struct.std::basic_string<char,std::char_traits<char>,std::allocator<char> >::_Alloc_hider" = type { i8* }
%"struct.std::locale" = type { %"struct.std::locale::_Impl"* }
%"struct.std::locale::_Impl" = type { i32, %"struct.std::locale::facet"**, i32, %"struct.std::locale::facet"**, i8** }
%"struct.std::locale::facet" = type { i32 (...)**, i32 }
%"struct.std::string" = type { %"struct.std::basic_string<char,std::char_traits<char>,std::allocator<char> >::_Alloc_hider" }

define void @_ZNKSt6locale4nameEv("struct.std::string"* %agg.result) {
define void @_ZNKSt6locale4nameEv(%"struct.std::string"* %agg.result) {
entry:
%tmp105 = icmp eq i8* null, null ; <i1> [#uses=1]
br i1 %tmp105, label %cond_true, label %cond_true222
Expand Down
1 change: 0 additions & 1 deletion test/CodeGen/PowerPC/2007-01-15-AsmDialect.ll
View file
Expand Up @@ -7,7 +7,6 @@ entry:
%temp = alloca i32, align 4 ; <i32*> [#uses=2]
%ctz_x = alloca i32, align 4 ; <i32*> [#uses=3]
%ctz_c = alloca i32, align 4 ; <i32*> [#uses=2]
"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
store i32 61440, i32* %ctz_x
%tmp = load i32* %ctz_x ; <i32> [#uses=1]
%tmp1 = sub i32 0, %tmp ; <i32> [#uses=1]
Expand Down
1 change: 0 additions & 1 deletion test/CodeGen/PowerPC/2007-05-22-tailmerge-3.ll
View file
Expand Up @@ -13,7 +13,6 @@ entry:
%i_addr = alloca i32 ; <i32*> [#uses=2]
%q_addr = alloca i32 ; <i32*> [#uses=2]
%retval = alloca i32, align 4 ; <i32*> [#uses=1]
"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
store i32 %i, i32* %i_addr
store i32 %q, i32* %q_addr
%tmp = load i32* %i_addr ; <i32> [#uses=1]
Expand Down
1 change: 0 additions & 1 deletion test/CodeGen/X86/2007-03-16-InlineAsm.ll
View file
Expand Up @@ -9,7 +9,6 @@ entry:
%retval = alloca i32, align 4 ; <i32*> [#uses=2]
%tmp = alloca i32, align 4 ; <i32*> [#uses=2]
%ret = alloca i32, align 4 ; <i32*> [#uses=2]
"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
store i32 %A, i32* %A_addr
store i32 %B, i32* %B_addr
%tmp1 = load i32* %A_addr ; <i32> [#uses=1]
Expand Down
8 changes: 4 additions & 4 deletions test/CodeGen/X86/mmx-shuffle.ll
View file
Expand Up @@ -5,12 +5,12 @@ target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f3
target triple = "i686-pc-linux-gnu"
%struct.DrawHelper = type { void (i32, %struct.QT_FT_Span*, i8*)*, void (i32, %struct.QT_FT_Span*, i8*)*, void (%struct.QRasterBuffer*, i32, i32, i32, i8*, i32, i32, i32)*, void (%struct.QRasterBuffer*, i32, i32, i32, i8*, i32, i32, i32)*, void (%struct.QRasterBuffer*, i32, i32, i32, i32, i32)* }
%struct.QBasicAtomic = type { i32 }
%struct.QClipData = type { i32, "struct.QClipData::ClipLine"*, i32, i32, %struct.QT_FT_Span*, i32, i32, i32, i32 }
"struct.QClipData::ClipLine" = type { i32, %struct.QT_FT_Span* }
%struct.QClipData = type { i32, %"struct.QClipData::ClipLine"*, i32, i32, %struct.QT_FT_Span*, i32, i32, i32, i32 }
%"struct.QClipData::ClipLine" = type { i32, %struct.QT_FT_Span* }
%struct.QRasterBuffer = type { %struct.QRect, %struct.QRegion, %struct.QClipData*, %struct.QClipData*, i8, i32, i32, %struct.DrawHelper*, i32, i32, i32, i8* }
%struct.QRect = type { i32, i32, i32, i32 }
%struct.QRegion = type { "struct.QRegion::QRegionData"* }
"struct.QRegion::QRegionData" = type { %struct.QBasicAtomic, %struct._XRegion*, i8*, %struct.QRegionPrivate* }
%struct.QRegion = type { %"struct.QRegion::QRegionData"* }
%"struct.QRegion::QRegionData" = type { %struct.QBasicAtomic, %struct._XRegion*, i8*, %struct.QRegionPrivate* }
%struct.QRegionPrivate = type opaque
%struct.QT_FT_Span = type { i16, i16, i16, i8 }
%struct._XRegion = type opaque
Expand Down
2 changes: 0 additions & 2 deletions test/Transforms/InstCombine/call2.ll
View file
Expand Up @@ -4,7 +4,6 @@
define i32 @bar() {
entry:
%retval = alloca i32, align 4 ; <i32*> [#uses=1]
"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
%tmp = call i32 (...)* bitcast (i32 (i8*)* @f to i32 (...)*)( double 3.000000e+00 ) ; <i32> [#uses=0]
br label %return

Expand All @@ -17,7 +16,6 @@ define i32 @f(i8* %p) {
entry:
%p_addr = alloca i8* ; <i8**> [#uses=1]
%retval = alloca i32, align 4 ; <i32*> [#uses=1]
"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
store i8* %p, i8** %p_addr
br label %return

Expand Down
1 change: 0 additions & 1 deletion test/Transforms/LoopRotate/PhiRename-1.ll
View file
Expand Up @@ -33,7 +33,6 @@ entry:
%c = alloca i32, align 4 ; <i32*> [#uses=4]
%l = alloca %struct.list*, align 4 ; <%struct.list**> [#uses=5]
%op = alloca %struct.operator*, align 4 ; <%struct.operator**> [#uses=3]
"alloca point" = bitcast i32 0 to i32 ; <i32> [#uses=0]
store i32 %arity, i32* %arity_addr
store i32 0, i32* %c
%tmp1 = load %struct.list** @operators ; <%struct.list*> [#uses=1]
Expand Down

0 comments on commit 7a1b9bd

Please sign in to comment.