Skip to content

Commit 1e4242a

Browse files
rakucoThe Qt Project
authored andcommitted
Bring in WebKit r74029 to fix the build with clang.
------------------------------------------------------------------------ r74029 | [email protected] | 2010-12-14 18:57:14 +0200 (Tue, 14 Dec 2010) | 12 lines Reviewed by Eric Seidel. Clang fails to build the JSC interpreter https://bugs.webkit.org/show_bug.cgi?id=51016 Clang does not allow indirect gotos out of scopes with cleanup. GCC 4.2 allows them, but it does not correctly generate the cleanup, causing a leak if the cleanup decrements a reference count. * interpreter/Interpreter.cpp: (JSC::Interpreter::privateExecute): Put an Identifier into its own scope. ------------------------------------------------------------------------ Cherry-picked from qtscript/c85662167123b433a69a662212c67ce03e44a25a. Change-Id: I21ee882961264d131cebdee04cb641c0d0de3d18 Reviewed-by: Simon Hausmann <[email protected]>
1 parent 87a8400 commit 1e4242a

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2493,8 +2493,10 @@ JSValue Interpreter::privateExecute(ExecutionFlag flag, RegisterFile* registerFi
24932493
vPC += OPCODE_LENGTH(op_get_by_pname);
24942494
NEXT_INSTRUCTION();
24952495
}
2496-
Identifier propertyName(callFrame, subscript.toString(callFrame));
2497-
result = baseValue.get(callFrame, propertyName);
2496+
{
2497+
Identifier propertyName(callFrame, subscript.toString(callFrame));
2498+
result = baseValue.get(callFrame, propertyName);
2499+
}
24982500
CHECK_FOR_EXCEPTION();
24992501
callFrame->r(dst) = result;
25002502
vPC += OPCODE_LENGTH(op_get_by_pname);

0 commit comments

Comments
 (0)