diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-09 08:53:46 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-09 08:53:46 +0100 |
| commit | 8cecf8d5208f3945b35f879bba3015bb1a11bec6 (patch) | |
| tree | 0926f5c21f9d10cf929e4c35e7d7e8e8c084dbf5 /js/src/shell/js.cpp | |
| parent | 8cd777888a40e987ad536ab68421068f5c06d83b (diff) | |
| parent | 92104eb6828ba026550e1f4a3c6890c5b8254d36 (diff) | |
| download | UXP-8cecf8d5208f3945b35f879bba3015bb1a11bec6.tar UXP-8cecf8d5208f3945b35f879bba3015bb1a11bec6.tar.gz UXP-8cecf8d5208f3945b35f879bba3015bb1a11bec6.tar.lz UXP-8cecf8d5208f3945b35f879bba3015bb1a11bec6.tar.xz UXP-8cecf8d5208f3945b35f879bba3015bb1a11bec6.zip | |
Merge branch 'ported-upstream'
Diffstat (limited to 'js/src/shell/js.cpp')
| -rw-r--r-- | js/src/shell/js.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp index 88d482a23..3f56981cd 100644 --- a/js/src/shell/js.cpp +++ b/js/src/shell/js.cpp @@ -1546,9 +1546,9 @@ ConvertTranscodeResultToJSException(JSContext* cx, JS::TranscodeResult rv) MOZ_ASSERT(!cx->isExceptionPending()); JS_ReportErrorASCII(cx, "Asm.js is not supported by XDR"); return false; - case JS::TranscodeResult_Failure_UnknownClassKind: + case JS::TranscodeResult_Failure_BadDecode: MOZ_ASSERT(!cx->isExceptionPending()); - JS_ReportErrorASCII(cx, "Unknown class kind, go fix it."); + JS_ReportErrorASCII(cx, "XDR data corruption"); return false; case JS::TranscodeResult_Throw: |