diff options
-rw-r--r-- | lib/AsmParser/Lexer.l | 1 | ||||
-rw-r--r-- | lib/AsmParser/llvmAsmParser.y | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/lib/AsmParser/Lexer.l b/lib/AsmParser/Lexer.l index e2476fdf09..d62e47a580 100644 --- a/lib/AsmParser/Lexer.l +++ b/lib/AsmParser/Lexer.l @@ -179,7 +179,6 @@ false { return FALSETOK; } declare { return DECLARE; } global { return GLOBAL; } constant { return CONSTANT; } -const { return CONST; } internal { return INTERNAL; } linkonce { return LINKONCE; } weak { return WEAK; } diff --git a/lib/AsmParser/llvmAsmParser.y b/lib/AsmParser/llvmAsmParser.y index ea06f875ad..8e6267b584 100644 --- a/lib/AsmParser/llvmAsmParser.y +++ b/lib/AsmParser/llvmAsmParser.y @@ -1424,12 +1424,7 @@ FunctionList : FunctionList Function { }; // ConstPool - Constants with optional names assigned to them. -ConstPool : ConstPool OptAssign CONST ConstVal { - // FIXME: THIS SHOULD REALLY BE ELIMINATED. It is totally unneeded. - if (!setValueNameMergingDuplicates($4, $2)) - InsertValue($4); - } - | ConstPool OptAssign TYPE TypesV { // Types can be defined in the const pool +ConstPool : ConstPool OptAssign TYPE TypesV { // Types can be defined in the const pool // Eagerly resolve types. This is not an optimization, this is a // requirement that is due to the fact that we could have this: // |