diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2022-06-07 20:20:19 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2022-06-07 20:20:19 -0500 |
| commit | 878ab758d5d4c1ef7badf2bc20ebc7c67dc2165b (patch) | |
| tree | 3683d6df35e3618c0e7b456de7c749ca4c8c21a6 /js/src/vm/Debugger.cpp | |
| parent | a621951327b0c19c0c24dfd9fd973f7bd13ae68f (diff) | |
| parent | cfb9884423faf741de03c5fcc72bf9ac8c6ada4d (diff) | |
| download | aura-central-878ab758d5d4c1ef7badf2bc20ebc7c67dc2165b.tar.gz | |
Merge branch 'TRUNK' into ARE-5.0
Diffstat (limited to 'js/src/vm/Debugger.cpp')
| -rw-r--r-- | js/src/vm/Debugger.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp index 1c875c606..0c021ff0e 100644 --- a/js/src/vm/Debugger.cpp +++ b/js/src/vm/Debugger.cpp @@ -10098,12 +10098,14 @@ DebuggerObject::forceLexicalInitializationByName(JSContext* cx, HandleDebuggerOb RootedObject globalLexical(cx, &referent->lexicalEnvironment()); RootedObject pobj(cx); - RootedShape shape(cx); - if (!LookupProperty(cx, globalLexical, id, &pobj, &shape)) + Rooted<PropertyResult> prop(cx); + if (!LookupProperty(cx, globalLexical, id, &pobj, &prop)) return false; result = false; - if (shape) { + if (prop) { + MOZ_ASSERT(prop.isNativeProperty()); + Shape* shape = prop.shape(); Value v = globalLexical->as<NativeObject>().getSlot(shape->slot()); if (shape->hasSlot() && v.isMagic() && v.whyMagic() == JS_UNINITIALIZED_LEXICAL) { globalLexical->as<NativeObject>().setSlot(shape->slot(), UndefinedValue()); |