M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

compiler: Handle None-returning function calls used as values 

GitHub: Fixes #1493.
This commit is contained in:
David Nadlinger 2020-07-25 02:18:10 +01:00 committed by Sebastien Bourdeauducq
parent f4d331d05d
commit 5dc3b3b28c
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artiq/compiler/transforms/llvm_ir_generator.py
View File

@ -1462,6 +1462,11 @@ class LLVMIRGenerator:
else: else:
llcall = llresult = self.llbuilder.call(llfun, llargs, name=insn.name) llcall = llresult = self.llbuilder.call(llfun, llargs, name=insn.name)
if isinstance(llresult.type, ll.VoidType):
# We have NoneType-returning functions return void, but None is
# {} elsewhere.
llresult = ll.Constant(llunit, [])
# Never add TBAA nowrite metadata to a functon with sret! # Never add TBAA nowrite metadata to a functon with sret!
# This leads to miscompilations. # This leads to miscompilations.
if types.is_c_function(functiontyp) and 'nowrite' in functiontyp.flags: if types.is_c_function(functiontyp) and 'nowrite' in functiontyp.flags:

11
artiq/test/lit/codegen/none_retval.py Normal file
View File

@ -0,0 +1,11 @@
# RUN: %python -m artiq.compiler.testbench.llvmgen %s
def make_none():
return None
def take_arg(arg):
pass
def run():
retval = make_none()
take_arg(retval)