diff options
| author | Gaming4JC <g4jc@hyperbola.info> | 2019-06-16 11:32:41 -0400 |
|---|---|---|
| committer | Gaming4JC <g4jc@hyperbola.info> | 2019-07-18 22:38:34 -0400 |
| commit | 8e932efef46c70fd0c165ee432893f9898267f08 (patch) | |
| tree | 64be5e8c0a9157f3c8044e4ad0659453fcd86bc8 /js | |
| parent | a781578b416c502e642ab465da3344abd419475f (diff) | |
| download | uxp-8e932efef46c70fd0c165ee432893f9898267f08.tar.gz | |
1283712 - Part 10: Support notes in getLastWarning shell-only testing function.
Diffstat (limited to 'js')
| -rw-r--r-- | js/src/shell/js.cpp | 8 | ||||
| -rw-r--r-- | js/src/vm/CommonPropertyNames.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp index 19bb6b84ab..1e24359557 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 e7a4f12221..eaeea84b93 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") \ |