diff options
author | Alon Zakai <alonzakai@gmail.com> | 2013-06-24 14:38:35 -0700 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2013-06-24 14:38:35 -0700 |
commit | 415a82bfa600aa976749e01431376b9a0a3c4e0a (patch) | |
tree | 6fa279dc9f3421f29628e5383f62ef7379cd5736 | |
parent | e94938b90603372d8dadfbbdc0ed4088ef68078b (diff) |
notice when a function call definitely does not have a return
-rw-r--r-- | src/jsifier.js | 10 | ||||
-rw-r--r-- | tests/cases/returnfp.ll | 23 |
2 files changed, 28 insertions, 5 deletions
diff --git a/src/jsifier.js b/src/jsifier.js index 062bae6c..ac6c259b 100644 --- a/src/jsifier.js +++ b/src/jsifier.js @@ -1180,7 +1180,7 @@ function JSify(data, functionsOnly, givenFunctions) { // in an assignment var disabled = DISABLE_EXCEPTION_CATCHING == 2 && !(item.funcData.ident in EXCEPTION_CATCHING_WHITELIST); var phiSets = calcPhiSets(item); - var call_ = makeFunctionCall(item.ident, item.params, item.funcData, item.type, ASM_JS && !disabled); + var call_ = makeFunctionCall(item.ident, item.params, item.funcData, item.type, ASM_JS && !disabled, !!item.assignTo || !item.standalone); var ret; @@ -1337,7 +1337,7 @@ function JSify(data, functionsOnly, givenFunctions) { return ret; }); - function makeFunctionCall(ident, params, funcData, type, forceByPointer) { + function makeFunctionCall(ident, params, funcData, type, forceByPointer, hasReturn) { // We cannot compile assembly. See comment in intertyper.js:'Call' assert(ident != 'asm', 'Inline assembly cannot be compiled to JavaScript!'); @@ -1465,8 +1465,8 @@ function JSify(data, functionsOnly, givenFunctions) { } } - var returnType; - if (byPointer || ASM_JS) { + var returnType = 'void'; + if ((byPointer || ASM_JS) && hasReturn) { returnType = getReturnType(type); } @@ -1511,7 +1511,7 @@ function JSify(data, functionsOnly, givenFunctions) { makeFuncLineActor('getelementptr', function(item) { return finalizeLLVMFunctionCall(item) }); makeFuncLineActor('call', function(item) { if (item.standalone && LibraryManager.isStubFunction(item.ident)) return ';'; - return makeFunctionCall(item.ident, item.params, item.funcData, item.type) + (item.standalone ? ';' : ''); + return makeFunctionCall(item.ident, item.params, item.funcData, item.type, false, !!item.assignTo || !item.standalone) + (item.standalone ? ';' : ''); }); makeFuncLineActor('unreachable', function(item) { diff --git a/tests/cases/returnfp.ll b/tests/cases/returnfp.ll new file mode 100644 index 00000000..974459e5 --- /dev/null +++ b/tests/cases/returnfp.ll @@ -0,0 +1,23 @@ +; ModuleID = 'tests/hello_world.bc' +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32-S128" +target triple = "i386-pc-linux-gnu" + +@.str = private unnamed_addr constant [15 x i8] c"hello, world!\0A\00", align 1 ; [#uses=1 type=[15 x i8]*] + +define internal void @__xmlRaiseError(void ()* %schannel) nounwind { + %call = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([15 x i8]* @.str, i32 0, i32 0)) ; [#uses=0 type=i32] + ret void +} + +; [#uses=0] +define i32 @main() { +entry: + %retval = alloca i32, align 4 ; [#uses=1 type=i32*] + store i32 0, i32* %retval + call void (void ()*)* @__xmlRaiseError(void ()* null) + ret i32 1 +} + +; [#uses=1] +declare i32 @printf(i8*, ...) + |