Bug 882037 - Fix incorrectly escaped %, and use semicolons after comma-separated lists. r=luke
authorJesse Ruderman <jruderman@gmail.com>
Wed, 12 Jun 2013 22:24:06 -0700
changeset 134921 37eb86cb83e5fad4a06617c39b52b13af9abe380
parent 134920 708f6cd81acbc9f88bd7e30553fa8555c33b33e5
child 134922 d5917b4a54794427ea39f89ecb5dd9eebe835802
push id24819
push userryanvm@gmail.com
push dateThu, 13 Jun 2013 19:28:50 +0000
treeherdermozilla-central@bb4f883bfa10 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersluke
bugs882037
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 882037 - Fix incorrectly escaped %, and use semicolons after comma-separated lists. r=luke
js/src/ion/AsmJS.cpp
--- a/js/src/ion/AsmJS.cpp
+++ b/js/src/ion/AsmJS.cpp
@@ -3986,17 +3986,17 @@ CheckDivOrMod(FunctionCompiler &f, Parse
             *type = Type::Intish;
         } else {
             *def = f.binary<MAsmJSUMod>(lhsDef, rhsDef);
             *type = Type::Int;
         }
         return true;
     }
 
-    return f.failf(expr, "arguments to / or &% must both be double, signed, or unsigned, "
+    return f.failf(expr, "arguments to / or %% must both be double, signed, or unsigned; "
                    "%s and %s are given", lhsType.toChars(), rhsType.toChars());
 }
 
 static bool
 CheckComparison(FunctionCompiler &f, ParseNode *comp, MDefinition **def, Type *type)
 {
     JS_ASSERT(comp->isKind(PNK_LT) || comp->isKind(PNK_LE) || comp->isKind(PNK_GT) ||
               comp->isKind(PNK_GE) || comp->isKind(PNK_EQ) || comp->isKind(PNK_NE));
@@ -4020,17 +4020,17 @@ CheckComparison(FunctionCompiler &f, Par
     }
 
     if (lhsType.isDouble() && rhsType.isDouble()) {
         *def = f.compare(lhsDef, rhsDef, comp->getOp(), MCompare::Compare_Double);
         *type = Type::Int;
         return true;
     }
 
-    return f.failf(comp, "arguments to a comparison must both be signed, unsigned or doubles, "
+    return f.failf(comp, "arguments to a comparison must both be signed, unsigned or doubles; "
                    "%s and %s are given", lhsType.toChars(), rhsType.toChars());
 }
 
 static bool
 CheckBitwise(FunctionCompiler &f, ParseNode *bitwise, MDefinition **def, Type *type)
 {
     ParseNode *lhs = BinaryLeft(bitwise);
     ParseNode *rhs = BinaryRight(bitwise);