summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGaming4JC <g4jc@hyperbola.info>2019-06-16 11:32:41 -0400
committerGaming4JC <g4jc@hyperbola.info>2019-07-18 22:38:34 -0400
commit8e932efef46c70fd0c165ee432893f9898267f08 (patch)
tree64be5e8c0a9157f3c8044e4ad0659453fcd86bc8
parenta781578b416c502e642ab465da3344abd419475f (diff)
downloadUXP-8e932efef46c70fd0c165ee432893f9898267f08.tar
UXP-8e932efef46c70fd0c165ee432893f9898267f08.tar.gz
UXP-8e932efef46c70fd0c165ee432893f9898267f08.tar.lz
UXP-8e932efef46c70fd0c165ee432893f9898267f08.tar.xz
UXP-8e932efef46c70fd0c165ee432893f9898267f08.zip
1283712 - Part 10: Support notes in getLastWarning shell-only testing function.
-rw-r--r--js/src/shell/js.cpp8
-rw-r--r--js/src/vm/CommonPropertyNames.h1
2 files changed, 9 insertions, 0 deletions
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp
index 19bb6b84a..1e2435955 100644
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -6419,6 +6419,14 @@ CreateLastWarningObject(JSContext* cx, JSErrorReport* report)
if (!DefineProperty(cx, warningObj, cx->names().columnNumber, columnVal))
return false;
+ RootedObject notesArray(cx, CreateErrorNotesArray(cx, report));
+ if (!notesArray)
+ return false;
+
+ RootedValue notesArrayVal(cx, ObjectValue(*notesArray));
+ if (!DefineProperty(cx, warningObj, cx->names().notes, notesArrayVal))
+ return false;
+
GetShellContext(cx)->lastWarning.setObject(*warningObj);
return true;
}
diff --git a/js/src/vm/CommonPropertyNames.h b/js/src/vm/CommonPropertyNames.h
index e7a4f1222..eaeea84b9 100644
--- a/js/src/vm/CommonPropertyNames.h
+++ b/js/src/vm/CommonPropertyNames.h
@@ -217,6 +217,7 @@
macro(noFilename, noFilename, "noFilename") \
macro(nonincrementalReason, nonincrementalReason, "nonincrementalReason") \
macro(noStack, noStack, "noStack") \
+ macro(notes, notes, "notes") \
macro(NumberFormat, NumberFormat, "NumberFormat") \
macro(NumberFormatFormatGet, NumberFormatFormatGet, "Intl_NumberFormat_format_get") \
macro(numeric, numeric, "numeric") \