1 files changed, 45 insertions, 0 deletions
diff --git a/js/src/jit-test/tests/parser/columnNumber.js b/js/src/jit-test/tests/parser/columnNumber.js
new file mode 100644
index 0000000000..b54888dbe3
--- /dev/null
+++ b/js/src/jit-test/tests/parser/columnNumber.js
@@ -0,0 +1,45 @@
+// Simple tests for evaluate's "columnNumber" option.
+
+load(libdir + 'asserts.js');
+
+assertEq(evaluate("saveStack().column"), 1);
+assertEq(evaluate("saveStack().column", { columnNumber: 1729 }), 1730);
+assertEq(evaluate("\nsaveStack().column", { columnNumber: 1729 }), 1);
+assertEq(evaluate("saveStack().column", { columnNumber: "42" }), 43);
+assertThrowsInstanceOf(() => evaluate("saveStack().column", { columnNumber: -10 }),
+                       RangeError);
+assertThrowsInstanceOf(() => evaluate("saveStack().column", { columnNumber: Math.pow(2,30) }),
+                       RangeError);
+
+if (helperThreadCount() > 0) {
+  print("offThreadCompileScript 1");
+  offThreadCompileScript("saveStack().column", { columnNumber: -10 });
+  assertThrowsInstanceOf(runOffThreadScript, RangeError);
+
+  print("offThreadCompileScript 2");
+  offThreadCompileScript("saveStack().column", { columnNumber: Math.pow(2,30) });
+  assertThrowsInstanceOf(runOffThreadScript, RangeError);
+
+  print("offThreadCompileScript 3");
+  offThreadCompileScript("saveStack().column", { columnNumber: 10000 });
+  assertEq(runOffThreadScript(), 10001);
+}
+
+// Check handling of columns near the limit of our ability to represent them.
+// (This is hardly thorough, but since web content can't set column numbers,
+// it's probably not worth it to be thorough.)
+const maxColumn = Math.pow(2, 30) - 1;
+assertEq(evaluate("saveStack().column", { columnNumber: maxColumn }),
+         maxColumn + 1);
+
+// Check the saturation behavior when we reach the limit of the column
+// representation.
+assertEq(evaluate(" saveStack().column", { columnNumber: maxColumn }),
+         maxColumn + 1);
+
+// Gathering source text for inclusion in error messages should not try to reach
+// outside the buffer to find the start of the source line. The below should
+// report the error without crashing.
+assertThrowsInstanceOf(() => evaluate("function x(y,y) { 'use strict'; } x()",
+                                      { columnNumber: 10 }),
+                       SyntaxError);