mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 914760 - Generate less debugging code. r=rnewman
This commit is contained in:
parent
01113dc08a
commit
c60ee7469f
@ -44,7 +44,6 @@ public class CodeGenerator {
|
|||||||
"\n" +
|
"\n" +
|
||||||
"using namespace mozilla;\n" +
|
"using namespace mozilla;\n" +
|
||||||
"void AndroidBridge::InitStubs(JNIEnv *jEnv) {\n" +
|
"void AndroidBridge::InitStubs(JNIEnv *jEnv) {\n" +
|
||||||
" ALOG_BRIDGE(\"%s\", __PRETTY_FUNCTION__);\n" +
|
|
||||||
" initInit();\n");
|
" initInit();\n");
|
||||||
// Now we write the various GetStaticMethodID calls here...
|
// Now we write the various GetStaticMethodID calls here...
|
||||||
|
|
||||||
@ -124,8 +123,7 @@ public class CodeGenerator {
|
|||||||
wrapperMethodBodies.append('\n');
|
wrapperMethodBodies.append('\n');
|
||||||
wrapperMethodBodies.append(methodSignature);
|
wrapperMethodBodies.append(methodSignature);
|
||||||
|
|
||||||
wrapperMethodBodies.append(" {\n" +
|
wrapperMethodBodies.append(" {\n");
|
||||||
" ALOG_BRIDGE(\"%s\", __PRETTY_FUNCTION__);\n");
|
|
||||||
|
|
||||||
// Static stubs check the bridge instance has been created before trying to run.
|
// Static stubs check the bridge instance has been created before trying to run.
|
||||||
if (aIsStaticBridgeMethod) {
|
if (aIsStaticBridgeMethod) {
|
||||||
@ -267,18 +265,15 @@ public class CodeGenerator {
|
|||||||
wrapperMethodBodies.append(" ");
|
wrapperMethodBodies.append(" ");
|
||||||
wrapperMethodBodies.append(Utils.getCReturnType(returnType));
|
wrapperMethodBodies.append(Utils.getCReturnType(returnType));
|
||||||
wrapperMethodBodies.append(" ret = static_cast<").append(Utils.getCReturnType(returnType)).append(">(env->PopLocalFrame(temp));\n" +
|
wrapperMethodBodies.append(" ret = static_cast<").append(Utils.getCReturnType(returnType)).append(">(env->PopLocalFrame(temp));\n" +
|
||||||
" ALOG_BRIDGE(\"Exit of: %s\", __PRETTY_FUNCTION__);\n" +
|
|
||||||
" return ret;\n");
|
" return ret;\n");
|
||||||
} else if (!returnType.getCanonicalName().equals("void")) {
|
} else if (!returnType.getCanonicalName().equals("void")) {
|
||||||
// If we're a primitive-returning function, just return the directly-obtained primative
|
// If we're a primitive-returning function, just return the directly-obtained primative
|
||||||
// from the call to Java.
|
// from the call to Java.
|
||||||
wrapperMethodBodies.append(" env->PopLocalFrame(NULL);\n" +
|
wrapperMethodBodies.append(" env->PopLocalFrame(NULL);\n" +
|
||||||
" ALOG_BRIDGE(\"Exit of: %s\", __PRETTY_FUNCTION__);\n" +
|
|
||||||
" return temp;\n");
|
" return temp;\n");
|
||||||
} else {
|
} else {
|
||||||
// If we don't return anything, just pop the stack frame and move on with life.
|
// If we don't return anything, just pop the stack frame and move on with life.
|
||||||
wrapperMethodBodies.append(" ALOG_BRIDGE(\"Exit of: %s\", __PRETTY_FUNCTION__);\n" +
|
wrapperMethodBodies.append(" env->PopLocalFrame(NULL);\n");
|
||||||
" env->PopLocalFrame(NULL);\n");
|
|
||||||
}
|
}
|
||||||
wrapperMethodBodies.append("}\n");
|
wrapperMethodBodies.append("}\n");
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user