Remove a gross and crufty "feature" that was never documented and doesn't work.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@14809 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/AsmParser/Lexer.l b/lib/AsmParser/Lexer.l
index e2476fdf09901a1a7ceb74c00bfcf3b1d7e3b8e9..d62e47a5803288da0501e0aed489caedd1efaff3 100644 (file)
--- 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 ea06f875ad08bfb3e2f44ded3ca7ce16ed8ba1ae..8e6267b584d69d50b69124de626af412d4c4905d 100644 (file)
--- 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:
     //