Don't convert {} into []!

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

diff --git a/tools/llvm-upgrade/UpgradeParser.cpp b/tools/llvm-upgrade/UpgradeParser.cpp
index 6ac134a57adc1ec048eae7bade4a5c9e1cc9d9c6..6c1880c88b209d404cf671a7ff7378ab408129e4 100644 (file)
--- a/tools/llvm-upgrade/UpgradeParser.cpp
+++ b/tools/llvm-upgrade/UpgradeParser.cpp
@@ -2279,7 +2279,7 @@ yyreduce:
   case 107:
 #line 329 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                                  // Empty structure type?
-    (yyval.Type).newTy = new std::string("{ }");
+    (yyval.Type).newTy = new std::string("{}");
     (yyval.Type).oldTy = StructTy;
   ;}
     break;
@@ -2386,7 +2386,7 @@ yyreduce:
     {
     (yyval.Const).type = (yyvsp[-2].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-2].Type).newTy);
-    *(yyval.Const).cnst += " [ ]";
+    *(yyval.Const).cnst += " {}";
   ;}
     break;
 

diff --git a/tools/llvm-upgrade/UpgradeParser.cpp.cvs b/tools/llvm-upgrade/UpgradeParser.cpp.cvs
index 6ac134a57adc1ec048eae7bade4a5c9e1cc9d9c6..6c1880c88b209d404cf671a7ff7378ab408129e4 100644 (file)
--- a/tools/llvm-upgrade/UpgradeParser.cpp.cvs
+++ b/tools/llvm-upgrade/UpgradeParser.cpp.cvs
@@ -2279,7 +2279,7 @@ yyreduce:
   case 107:
 #line 329 "/proj/llvm/llvm-4/tools/llvm-upgrade/UpgradeParser.y"
     {                                  // Empty structure type?
-    (yyval.Type).newTy = new std::string("{ }");
+    (yyval.Type).newTy = new std::string("{}");
     (yyval.Type).oldTy = StructTy;
   ;}
     break;
@@ -2386,7 +2386,7 @@ yyreduce:
     {
     (yyval.Const).type = (yyvsp[-2].Type);
     (yyval.Const).cnst = new std::string(*(yyvsp[-2].Type).newTy);
-    *(yyval.Const).cnst += " [ ]";
+    *(yyval.Const).cnst += " {}";
   ;}
     break;
 

diff --git a/tools/llvm-upgrade/UpgradeParser.y b/tools/llvm-upgrade/UpgradeParser.y
index 79c1d947f6f40c05903a403b87a72e905d318c43..e5f9035c254e58bef566bc70ed02582652c00f8a 100644 (file)
--- a/tools/llvm-upgrade/UpgradeParser.y
+++ b/tools/llvm-upgrade/UpgradeParser.y
@@ -327,7 +327,7 @@ UpRTypes : '\\' EUINT64VAL {                   // Type UpReference
     $$.oldTy = StructTy;
   }
   | '{' '}' {                                  // Empty structure type?
-    $$.newTy = new std::string("{ }");
+    $$.newTy = new std::string("{}");
     $$.oldTy = StructTy;
   }
   | UpRTypes '*' {                             // Pointer type?
@@ -402,7 +402,7 @@ ConstVal: Types '[' ConstVector ']' { // Nonempty unsized arr
   | Types '{' '}' {
     $$.type = $1;
     $$.cnst = new std::string(*$1.newTy);
-    *$$.cnst += " [ ]";
+    *$$.cnst += " {}";
   }
   | Types NULL_TOK {
     $$.type = $1;

diff --git a/tools/llvm-upgrade/UpgradeParser.y.cvs b/tools/llvm-upgrade/UpgradeParser.y.cvs
index 79c1d947f6f40c05903a403b87a72e905d318c43..e5f9035c254e58bef566bc70ed02582652c00f8a 100644 (file)
--- a/tools/llvm-upgrade/UpgradeParser.y.cvs
+++ b/tools/llvm-upgrade/UpgradeParser.y.cvs
@@ -327,7 +327,7 @@ UpRTypes : '\\' EUINT64VAL {                   // Type UpReference
     $$.oldTy = StructTy;
   }
   | '{' '}' {                                  // Empty structure type?
-    $$.newTy = new std::string("{ }");
+    $$.newTy = new std::string("{}");
     $$.oldTy = StructTy;
   }
   | UpRTypes '*' {                             // Pointer type?
@@ -402,7 +402,7 @@ ConstVal: Types '[' ConstVector ']' { // Nonempty unsized arr
   | Types '{' '}' {
     $$.type = $1;
     $$.cnst = new std::string(*$1.newTy);
-    *$$.cnst += " [ ]";
+    *$$.cnst += " {}";
   }
   | Types NULL_TOK {
     $$.type = $1;