diff options
author | Chris Lattner <sabre@nondot.org> | 2003-10-19 21:34:28 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2003-10-19 21:34:28 +0000 |
commit | 3b237fcd385a734b49bb54893ce256ba181e36f9 (patch) | |
tree | e2cbde4832ffbd2160bea61006af1cbe415e3604 /lib/AsmParser | |
parent | 4661dc6a6abc9ef22e674fe4951a715befd4e072 (diff) | |
download | external_llvm-3b237fcd385a734b49bb54893ce256ba181e36f9.zip external_llvm-3b237fcd385a734b49bb54893ce256ba181e36f9.tar.gz external_llvm-3b237fcd385a734b49bb54893ce256ba181e36f9.tar.bz2 |
Change the Opcode enum for PHI nodes from "Instruction::PHINode" to "Instruction::PHI" to be more consistent with the other instructions.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@9269 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/AsmParser')
-rw-r--r-- | lib/AsmParser/Lexer.l | 2 | ||||
-rw-r--r-- | lib/AsmParser/llvmAsmParser.y | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/AsmParser/Lexer.l b/lib/AsmParser/Lexer.l index f0f007b..3092891 100644 --- a/lib/AsmParser/Lexer.l +++ b/lib/AsmParser/Lexer.l @@ -219,7 +219,7 @@ setgt { RET_TOK(BinaryOpVal, SetGT, SETGT); } setle { RET_TOK(BinaryOpVal, SetLE, SETLE); } setge { RET_TOK(BinaryOpVal, SetGE, SETGE); } -phi { RET_TOK(OtherOpVal, PHINode, PHI); } +phi { RET_TOK(OtherOpVal, PHI, PHI_TOK); } call { RET_TOK(OtherOpVal, Call, CALL); } cast { RET_TOK(OtherOpVal, Cast, CAST); } shl { RET_TOK(OtherOpVal, Shl, SHL); } diff --git a/lib/AsmParser/llvmAsmParser.y b/lib/AsmParser/llvmAsmParser.y index efb9d3e..eb56f11 100644 --- a/lib/AsmParser/llvmAsmParser.y +++ b/lib/AsmParser/llvmAsmParser.y @@ -785,7 +785,7 @@ Module *RunVMAsmParser(const std::string &Filename, FILE *F) { // Other Operators %type <OtherOpVal> ShiftOps -%token <OtherOpVal> PHI CALL CAST SHL SHR VAARG VANEXT +%token <OtherOpVal> PHI_TOK CALL CAST SHL SHR VAARG VANEXT %token VA_ARG // FIXME: OBSOLETE %start Module @@ -1747,7 +1747,7 @@ InstVal : ArithmeticOps Types ValueRef ',' ValueRef { $$ = new VANextInst($2, *$4); delete $4; } - | PHI PHIList { + | PHI_TOK PHIList { const Type *Ty = $2->front().first->getType(); $$ = new PHINode(Ty); $$->op_reserve($2->size()*2); |