From d8478e23a8ca38bf1064ef82fab01924a30a2e30 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Sat, 27 Jul 2013 15:11:27 +0200 Subject: MacOS: get instruction stream after closing buffer. Otherwise the QByteArray's constData might have been relocated, and the output might be anything but correct (e.g. empty). Change-Id: I2eb1223d2e0577f41c8f9e6ce81cb65af05166da Reviewed-by: Simon Hausmann Reviewed-by: Lars Knoll --- src/qml/qml/v4/qv4isel_masm.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qml/qml/v4/qv4isel_masm.cpp b/src/qml/qml/v4/qv4isel_masm.cpp index d4c84994b9..af77a7cb17 100644 --- a/src/qml/qml/v4/qv4isel_masm.cpp +++ b/src/qml/qml/v4/qv4isel_masm.cpp @@ -608,10 +608,10 @@ void Assembler::link(QV4::Function *vmFunc) WTF::setDataFile(stderr); #if (OS(LINUX) && !defined(Q_OS_ANDROID)) || OS(MAC_OS_X) + fclose(disasmStream); # if OS(MAC_OS_X) char *disasmOutput = memStream.buf.data(); # endif - fclose(disasmStream); # if CPU(X86) || CPU(X86_64) QHash idents; printDisassembledOutputWithCalls(disasmOutput, functions, _vmFunction->identifiers); -- cgit v1.2.3