standalone: Add flags to control demo output options

Fixes `undefined reference to 'pow'` for pow.py using -O0.

nac3core/src/codegen/mod.rs

@@ -1,4 +1,5 @@
 use crate::{
+    codegen::stmt::gen_block,
     symbol_resolver::{StaticValue, SymbolResolver},
     toplevel::{TopLevelContext, TopLevelDef},
     typecheck::{
@@ -160,7 +161,7 @@ pub struct CodeGenContext<'ctx, 'a> {
 
 impl<'ctx, 'a> CodeGenContext<'ctx, 'a> {
     pub fn is_terminated(&self) -> bool {
-        self.builder.get_insert_block().unwrap().get_terminator().is_some()
+        self.builder.get_insert_block().and_then(|bb| bb.get_terminator()).is_some()
     }
 }
 
@@ -854,10 +855,7 @@ pub fn gen_func<'ctx, G: CodeGenerator>(
 ) -> Result<(Builder<'ctx>, Module<'ctx>, FunctionValue<'ctx>), (Builder<'ctx>, String)> {
     let body = task.body.clone();
     gen_func_impl(context, generator, registry, builder, module, task, |generator, ctx| {
-        for stmt in body.iter() {
-            generator.gen_stmt(ctx, stmt)?;
-        }
-        Ok(())
+        gen_block(generator, ctx, body.iter())
     })
 }
 

nac3core/src/typecheck/function_check.rs

@@ -295,7 +295,7 @@ impl<'a> Inferencer<'a> {
         let mut ret = false;
         for stmt in block {
             if ret {
-                return Err(format!("dead code at {:?}", stmt.location));
+                println!("warning: dead code at {:?}\n", stmt.location)
             }
             if self.check_stmt(stmt, defined_identifiers)? {
                 ret = true;

nac3standalone/demo/check_demo.sh

@@ -7,15 +7,19 @@ if [ -z "$1" ]; then
   exit 1
 fi
 
-demo="${@:-1}"
-set -- "${@:1:$(($# - 1))}"
+declare -a nac3args
+while [ $# -gt 1 ]; do
+  nac3args+=("$1")
+  shift
+done
+demo="$1"
 
 echo -n "Checking $demo... "
 ./interpret_demo.py "$demo" > interpreted.log
-./run_demo.sh "$@" "$demo" > run.log
-./run_demo_lli.sh "$@" "$demo" > run_lli.log
+./run_demo.sh --out run.log "${nac3args[@]}" "$demo"
+./run_demo.sh --lli --out run_lli.log "${nac3args[@]}" "$demo"
 diff -Nau interpreted.log run.log
 diff -Nau interpreted.log run_lli.log
 echo "ok"
 
-rm -f interpreted.log run.log run_lli.log
+rm -f interpreted.log run.log run_lli.log

nac3standalone/demo/run_demo.sh

@@ -7,6 +7,23 @@ if [ -z "$1" ]; then
     exit 1
 fi
 
+declare -a nac3args
+while [ $# -ge 1 ]; do
+  case "$1" in
+    --out)
+      shift
+      outfile="$1"
+      ;;
+    --lli)
+      use_lli=1
+      ;;
+    *)
+      nac3args+=("$1")
+      ;;
+  esac
+  shift
+done
+
 if [ -e ../../target/release/nac3standalone ]; then
     nac3standalone=../../target/release/nac3standalone
 else
@@ -14,9 +31,29 @@ else
     nac3standalone=../../target/x86_64-unknown-linux-gnu/release/nac3standalone
 fi
 
-rm -f "*.o" demo
+if [ -z "$use_lli" ]; then
+  rm -f "*.o" demo
 
-$nac3standalone "$@"
-clang -c -std=gnu11 -Wall -Wextra -O3 -o demo.o demo.c
-clang -o demo module.o demo.o
-./demo
+  $nac3standalone "${nac3args[@]}"
+
+  clang -c -std=gnu11 -Wall -Wextra -O3 -o demo.o demo.c
+  clang -lm -o demo module.o demo.o
+
+  if [ -z "$outfile" ]; then
+    ./demo
+  else
+    ./demo > "$outfile"
+  fi
+else
+  rm -f "*.o" "*.bc" demo
+
+  $nac3standalone --emit-llvm "${nac3args[@]}"
+
+  clang -c -std=gnu11 -Wall -Wextra -O3 -emit-llvm -o demo.bc demo.c
+
+  if [ -z "$outfile" ]; then
+    lli --extra-module demo.bc --extra-module irrt.bc main.bc
+  else
+    lli --extra-module demo.bc --extra-module irrt.bc main.bc > "$outfile"
+  fi
+fi

nac3standalone/demo/run_demo_lli.sh

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-if [ -z "$1" ]; then
-    echo "No argument supplied"
-    exit 1
-fi
-
-if [ -e ../../target/release/nac3standalone ]; then
-    nac3standalone=../../target/release/nac3standalone
-else
-    # used by Nix builds
-    nac3standalone=../../target/x86_64-unknown-linux-gnu/release/nac3standalone
-fi
-
-rm -f "*.o" "*.bc" demo
-
-$nac3standalone --emit-llvm "$@"
-clang -c -std=gnu11 -Wall -Wextra -O3 -emit-llvm -o demo.bc demo.c
-lli --extra-module demo.bc --extra-module irrt.bc main.bc

nac3standalone/demo/src/dead_code_issue118.py

@@ -0,0 +1,8 @@
+def f():
+	return
+	return
+
+def run() -> int32:
+	f()
+
+	return 0