[llvm] r203376 - IR: Change inalloca's grammar a bit
David Majnemer
david.majnemer at gmail.com
Sat Mar 8 22:41:59 PST 2014
Author: majnemer
Date: Sun Mar 9 00:41:58 2014
New Revision: 203376
URL: http://llvm.org/viewvc/llvm-project?rev=203376&view=rev
Log:
IR: Change inalloca's grammar a bit
The grammar for LLVM IR is not well specified in any document but seems
to obey the following rules:
- Attributes which have parenthesized arguments are never preceded by
commas. This form of attribute is the only one which ever has
optional arguments. However, not all of these attributes support
optional arguments: 'thread_local' supports an optional argument but
'addrspace' does not. Interestingly, 'addrspace' is documented as
being a "qualifier". What constitutes a qualifier? I cannot find a
definition.
- Some attributes use a space between the keyword and the value.
Examples of this form are 'align' and 'section'. These are always
preceded by a comma.
- Otherwise, the attribute has no argument. These attributes do not
have a preceding comma.
Sometimes an attribute goes before the instruction, between the
instruction and it's type, or after it's type. 'atomicrmw' has
'volatile' between the instruction and the type while 'call' has 'tail'
preceding the instruction.
With all this in mind, it seems most consistent for 'inalloca' on an
'inalloca' instruction to occur before between the instruction and the
type. Unlike the current formulation, there would be no preceding
comma. The combination 'alloca inalloca' doesn't look particularly
appetizing, perhaps a better spelling of 'inalloca' is down the road.
Modified:
llvm/trunk/docs/LangRef.rst
llvm/trunk/lib/AsmParser/LLParser.cpp
llvm/trunk/lib/IR/AsmWriter.cpp
llvm/trunk/test/Assembler/inalloca.ll
llvm/trunk/test/CodeGen/X86/dynamic-alloca-in-entry.ll
llvm/trunk/test/CodeGen/X86/inalloca-ctor.ll
llvm/trunk/test/CodeGen/X86/inalloca-invoke.ll
llvm/trunk/test/CodeGen/X86/inalloca-stdcall.ll
llvm/trunk/test/CodeGen/X86/inalloca.ll
llvm/trunk/test/Transforms/DeadArgElim/keepalive.ll
llvm/trunk/test/Verifier/inalloca-vararg.ll
llvm/trunk/test/Verifier/inalloca2.ll
Modified: llvm/trunk/docs/LangRef.rst
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/LangRef.rst?rev=203376&r1=203375&r2=203376&view=diff
==============================================================================
--- llvm/trunk/docs/LangRef.rst (original)
+++ llvm/trunk/docs/LangRef.rst Sun Mar 9 00:41:58 2014
@@ -4713,7 +4713,7 @@ Syntax:
::
- <result> = alloca <type>[, inalloca][, <ty> <NumElements>][, align <alignment>] ; yields {type*}:result
+ <result> = alloca [inalloca] <type> [, <ty> <NumElements>] [, align <alignment>] ; yields {type*}:result
Overview:
"""""""""
Modified: llvm/trunk/lib/AsmParser/LLParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.cpp?rev=203376&r1=203375&r2=203376&view=diff
==============================================================================
--- llvm/trunk/lib/AsmParser/LLParser.cpp (original)
+++ llvm/trunk/lib/AsmParser/LLParser.cpp Sun Mar 9 00:41:58 2014
@@ -707,7 +707,8 @@ bool LLParser::ParseAlias(const std::str
/// OptionalThreadLocal OptionalAddrSpace OptionalUnNammedAddr
/// OptionalExternallyInitialized GlobalType Type Const
///
-/// Everything through visibility has been parsed already.
+/// Everything up to and including OptionalDLLStorageClass has been parsed
+/// already.
///
bool LLParser::ParseGlobal(const std::string &Name, LocTy NameLoc,
unsigned Linkage, bool HasLinkage,
@@ -4071,33 +4072,27 @@ bool LLParser::ParseCall(Instruction *&I
//===----------------------------------------------------------------------===//
/// ParseAlloc
-/// ::= 'alloca' Type (',' 'inalloca')? (',' TypeAndValue)? (',' OptionalInfo)?
+/// ::= 'alloca' 'inalloca'? Type (',' TypeAndValue)? (',' 'align' i32)?
int LLParser::ParseAlloc(Instruction *&Inst, PerFunctionState &PFS) {
Value *Size = 0;
LocTy SizeLoc;
unsigned Alignment = 0;
- bool IsInAlloca = false;
Type *Ty = 0;
+
+ bool IsInAlloca = EatIfPresent(lltok::kw_inalloca);
+
if (ParseType(Ty)) return true;
bool AteExtraComma = false;
if (EatIfPresent(lltok::comma)) {
- bool HaveComma = true;
- if (EatIfPresent(lltok::kw_inalloca)) {
- IsInAlloca = true;
- HaveComma = EatIfPresent(lltok::comma);
- }
-
- if (HaveComma) {
- if (Lex.getKind() == lltok::kw_align) {
- if (ParseOptionalAlignment(Alignment)) return true;
- } else if (Lex.getKind() == lltok::MetadataVar) {
- AteExtraComma = true;
- } else {
- if (ParseTypeAndValue(Size, SizeLoc, PFS) ||
- ParseOptionalCommaAlign(Alignment, AteExtraComma))
- return true;
- }
+ if (Lex.getKind() == lltok::kw_align) {
+ if (ParseOptionalAlignment(Alignment)) return true;
+ } else if (Lex.getKind() == lltok::MetadataVar) {
+ AteExtraComma = true;
+ } else {
+ if (ParseTypeAndValue(Size, SizeLoc, PFS) ||
+ ParseOptionalCommaAlign(Alignment, AteExtraComma))
+ return true;
}
}
Modified: llvm/trunk/lib/IR/AsmWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/AsmWriter.cpp?rev=203376&r1=203375&r2=203376&view=diff
==============================================================================
--- llvm/trunk/lib/IR/AsmWriter.cpp (original)
+++ llvm/trunk/lib/IR/AsmWriter.cpp Sun Mar 9 00:41:58 2014
@@ -1946,9 +1946,9 @@ void AssemblyWriter::printInstruction(co
} else if (const AllocaInst *AI = dyn_cast<AllocaInst>(&I)) {
Out << ' ';
- TypePrinter.print(AI->getAllocatedType(), Out);
if (AI->isUsedWithInAlloca())
- Out << ", inalloca";
+ Out << "inalloca ";
+ TypePrinter.print(AI->getAllocatedType(), Out);
if (!AI->getArraySize() || AI->isArrayAllocation()) {
Out << ", ";
writeOperand(AI->getArraySize(), true);
Modified: llvm/trunk/test/Assembler/inalloca.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/inalloca.ll?rev=203376&r1=203375&r2=203376&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/inalloca.ll (original)
+++ llvm/trunk/test/Assembler/inalloca.ll Sun Mar 9 00:41:58 2014
@@ -2,11 +2,11 @@
define void @a() {
entry:
- %0 = alloca i32, inalloca
- %1 = alloca [2 x i32], inalloca
- %2 = alloca i32, inalloca, i32 2
- %3 = alloca i32, inalloca, i32 2, align 16
- %4 = alloca i32, inalloca, i32 2, align 16, !foo !0
+ %0 = alloca inalloca i32
+ %1 = alloca inalloca [2 x i32]
+ %2 = alloca inalloca i32, i32 2
+ %3 = alloca inalloca i32, i32 2, align 16
+ %4 = alloca inalloca i32, i32 2, align 16, !foo !0
%5 = alloca i32, i32 2, align 16, !foo !0
%6 = alloca i32, i32 2, align 16
ret void
Modified: llvm/trunk/test/CodeGen/X86/dynamic-alloca-in-entry.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/dynamic-alloca-in-entry.ll?rev=203376&r1=203375&r2=203376&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/dynamic-alloca-in-entry.ll (original)
+++ llvm/trunk/test/CodeGen/X86/dynamic-alloca-in-entry.ll Sun Mar 9 00:41:58 2014
@@ -11,7 +11,7 @@ define void @foo(i32 %n) {
; Use of inalloca implies that that the alloca is not static.
define void @bar() {
- %m = alloca i32, inalloca
+ %m = alloca inalloca i32
ret void
}
; CHECK-LABEL: _bar:
Modified: llvm/trunk/test/CodeGen/X86/inalloca-ctor.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/inalloca-ctor.ll?rev=203376&r1=203375&r2=203376&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/inalloca-ctor.ll (original)
+++ llvm/trunk/test/CodeGen/X86/inalloca-ctor.ll Sun Mar 9 00:41:58 2014
@@ -10,7 +10,7 @@ declare void @Foo_ctor(%Foo* %this)
define void @g() {
entry:
- %args = alloca %frame, inalloca
+ %args = alloca inalloca %frame
%c = getelementptr %frame* %args, i32 0, i32 2
; CHECK: movl $20, %eax
; CHECK: calll __chkstk
Modified: llvm/trunk/test/CodeGen/X86/inalloca-invoke.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/inalloca-invoke.ll?rev=203376&r1=203375&r2=203376&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/inalloca-invoke.ll (original)
+++ llvm/trunk/test/CodeGen/X86/inalloca-invoke.ll Sun Mar 9 00:41:58 2014
@@ -16,7 +16,7 @@ define i32 @main() {
blah:
%inalloca.save = call i8* @llvm.stacksave()
- %rev_args = alloca %frame.reverse, inalloca, align 4
+ %rev_args = alloca inalloca %frame.reverse, align 4
%beg = getelementptr %frame.reverse* %rev_args, i32 0, i32 0
%end = getelementptr %frame.reverse* %rev_args, i32 0, i32 1
Modified: llvm/trunk/test/CodeGen/X86/inalloca-stdcall.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/inalloca-stdcall.ll?rev=203376&r1=203375&r2=203376&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/inalloca-stdcall.ll (original)
+++ llvm/trunk/test/CodeGen/X86/inalloca-stdcall.ll Sun Mar 9 00:41:58 2014
@@ -6,7 +6,7 @@ declare x86_stdcallcc void @f(%Foo* inal
declare x86_stdcallcc void @i(i32 %a)
define void @g() {
- %b = alloca %Foo, inalloca
+ %b = alloca inalloca %Foo
; CHECK: movl $8, %eax
; CHECK: calll __chkstk
; CHECK: movl %[[REG:[^,]*]], %esp
Modified: llvm/trunk/test/CodeGen/X86/inalloca.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/inalloca.ll?rev=203376&r1=203375&r2=203376&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/inalloca.ll (original)
+++ llvm/trunk/test/CodeGen/X86/inalloca.ll Sun Mar 9 00:41:58 2014
@@ -7,7 +7,7 @@ declare void @f(%Foo* inalloca %b)
define void @a() {
; CHECK-LABEL: _a:
entry:
- %b = alloca %Foo, inalloca
+ %b = alloca inalloca %Foo
; CHECK: movl $8, %eax
; CHECK: calll __chkstk
; CHECK: movl %[[REG:[^,]*]], %esp
@@ -27,7 +27,7 @@ declare void @inreg_with_inalloca(i32 in
define void @b() {
; CHECK-LABEL: _b:
entry:
- %b = alloca %Foo, inalloca
+ %b = alloca inalloca %Foo
; CHECK: movl $8, %eax
; CHECK: calll __chkstk
; CHECK: movl %[[REG:[^,]*]], %esp
@@ -48,7 +48,7 @@ declare x86_thiscallcc void @thiscall_wi
define void @c() {
; CHECK-LABEL: _c:
entry:
- %b = alloca %Foo, inalloca
+ %b = alloca inalloca %Foo
; CHECK: movl $8, %eax
; CHECK: calll __chkstk
; CHECK: movl %[[REG:[^,]*]], %esp
Modified: llvm/trunk/test/Transforms/DeadArgElim/keepalive.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/DeadArgElim/keepalive.ll?rev=203376&r1=203375&r2=203376&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/DeadArgElim/keepalive.ll (original)
+++ llvm/trunk/test/Transforms/DeadArgElim/keepalive.ll Sun Mar 9 00:41:58 2014
@@ -38,7 +38,7 @@ define internal x86_thiscallcc i32 @unus
define i32 @caller2() {
%t = alloca i32
- %m = alloca i32, inalloca
+ %m = alloca inalloca i32
store i32 42, i32* %m
%v = call x86_thiscallcc i32 @unused_this(i32* %t, i32* inalloca %m)
ret i32 %v
Modified: llvm/trunk/test/Verifier/inalloca-vararg.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Verifier/inalloca-vararg.ll?rev=203376&r1=203375&r2=203376&view=diff
==============================================================================
--- llvm/trunk/test/Verifier/inalloca-vararg.ll (original)
+++ llvm/trunk/test/Verifier/inalloca-vararg.ll Sun Mar 9 00:41:58 2014
@@ -2,7 +2,7 @@
declare void @h(i32, ...)
define void @i() {
- %args = alloca i32, inalloca
+ %args = alloca inalloca i32
call void (i32, ...)* @h(i32 1, i32* inalloca %args, i32 3)
; CHECK: inalloca isn't on the last argument!
ret void
Modified: llvm/trunk/test/Verifier/inalloca2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Verifier/inalloca2.ll?rev=203376&r1=203375&r2=203376&view=diff
==============================================================================
--- llvm/trunk/test/Verifier/inalloca2.ll (original)
+++ llvm/trunk/test/Verifier/inalloca2.ll Sun Mar 9 00:41:58 2014
@@ -6,7 +6,7 @@ declare void @doit(i64* inalloca %a)
define void @a() {
entry:
- %a = alloca [2 x i32], inalloca
+ %a = alloca inalloca [2 x i32]
%b = bitcast [2 x i32]* %a to i64*
call void @doit(i64* inalloca %b)
ret void
@@ -14,7 +14,7 @@ entry:
define void @b() {
entry:
- %a = alloca i64, inalloca
+ %a = alloca inalloca i64
call void @doit(i64* inalloca %a)
call void @doit(i64* inalloca %a)
ret void
@@ -25,11 +25,11 @@ entry:
br i1 %cond, label %if, label %else
if:
- %a = alloca i64, inalloca
+ %a = alloca inalloca i64
br label %call
else:
- %b = alloca i64, inalloca
+ %b = alloca inalloca i64
br label %call
call:
More information about the llvm-commits
mailing list