2 files changed, 3 insertions, 15 deletions
diff --git a/llvm/lib/AsmParser/ParserInternals.h b/llvm/lib/AsmParser/ParserInternals.h
index db84f92f7b0..3571138a0d2 100644
--- a/llvm/lib/AsmParser/ParserInternals.h
+++ b/llvm/lib/AsmParser/ParserInternals.h
@@ -64,8 +64,7 @@ static inline void ThrowException(const std::string &message,
 //
 struct ValID {
   enum {
-    NumberVal, NameVal, ConstSIntVal, ConstUIntVal, ConstStringVal, 
-    ConstFPVal, ConstNullVal
+    NumberVal, NameVal, ConstSIntVal, ConstUIntVal, ConstFPVal, ConstNullVal
   } Type;
 
   union {
@@ -92,10 +91,6 @@ struct ValID {
     ValID D; D.Type = ConstUIntVal; D.UConstPool64 = Val; return D;
   }
 
-  static ValID create_conststr(char *Name) {
-    ValID D; D.Type = ConstStringVal; D.Name = Name; return D;
-  }
-
   static ValID create(double Val) {
     ValID D; D.Type = ConstFPVal; D.ConstPoolFP = Val; return D;
   }
@@ -105,12 +100,12 @@ struct ValID {
   }
 
   inline void destroy() const {
-    if (Type == NameVal || Type == ConstStringVal)
+    if (Type == NameVal)
       free(Name);    // Free this strdup'd memory...
   }
 
   inline ValID copy() const {
-    if (Type != NameVal && Type != ConstStringVal) return *this;
+    if (Type != NameVal) return *this;
     ValID Result = *this;
     Result.Name = strdup(Name);
     return Result;
@@ -120,7 +115,6 @@ struct ValID {
     switch (Type) {
     case NumberVal     : return std::string("#") + itostr(Num);
     case NameVal       : return Name;
-    case ConstStringVal: return std::string("\"") + Name + std::string("\"");
     case ConstFPVal    : return ftostr(ConstPoolFP);
     case ConstNullVal  : return "null";
     case ConstUIntVal  :
@@ -136,7 +130,6 @@ struct ValID {
     if (Type != V.Type) return Type < V.Type;
     switch (Type) {
     case NumberVal:     return Num < V.Num;
-    case ConstStringVal:
     case NameVal:       return strcmp(Name, V.Name) < 0;
     case ConstSIntVal:  return ConstPool64  < V.ConstPool64;
     case ConstUIntVal:  return UConstPool64 < V.UConstPool64;
diff --git a/llvm/lib/AsmParser/llvmAsmParser.y b/llvm/lib/AsmParser/llvmAsmParser.y
index 91f4574a192..776e8c52a60 100644
--- a/llvm/lib/AsmParser/llvmAsmParser.y
+++ b/llvm/lib/AsmParser/llvmAsmParser.y
@@ -330,11 +330,6 @@ static Value *getValNonImprovising(const Type *Ty, const ValID &D) {
       return ConstantUInt::get(Ty, D.UConstPool64);
     }
 
-  case ValID::ConstStringVal:    // Is it a string const pool reference?
-    cerr << "FIXME: TODO: String constants [sbyte] not implemented yet!\n";
-    abort();
-    return 0;
-
   case ValID::ConstFPVal:        // Is it a floating point const pool reference?
     if (!ConstantFP::isValueValidForType(Ty, D.ConstPoolFP))
       ThrowException("FP constant invalid for type!!");