More robust type checking in DeclareVarInst::DeclareVarInst. Correct …

…a bug in LLVM backend -fm mode. Set version to 2.5.7.
skraninger · Nov 24, 2017 · 4799aca · 4799aca
1 parent 80da781
commit 4799aca
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 39 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-version := 2.5.6
+version := 2.5.7
 
 system	?= $(shell uname -s)
 

diff --git a/architecture/webaudio/libfaust-wasm.wasm b/architecture/webaudio/libfaust-wasm.wasm
diff --git a/architecture/webaudio/libfaust.js b/architecture/webaudio/libfaust.js
diff --git a/architecture/webaudio/libfaustworker.js b/architecture/webaudio/libfaustworker.js
diff --git a/compiler/generator/export.hh b/compiler/generator/export.hh
@@ -22,7 +22,7 @@
 #ifndef __export__
 #define __export__
 
-#define FAUSTVERSION "2.5.6"
+#define FAUSTVERSION "2.5.7"
 
 #ifdef _WIN32
 	#define	EXPORT __declspec(dllexport)

diff --git a/compiler/generator/instructions.cpp b/compiler/generator/instructions.cpp
@@ -46,11 +46,17 @@ DeclareVarInst::DeclareVarInst(Address* address, Typed* type, ValueInst* value)
     :fAddress(address), fType(type), fValue(value)
 {
     if (gGlobal->gVarTypeTable.find(fAddress->getName()) == gGlobal->gVarTypeTable.end()) {
-        gGlobal->gVarTypeTable[fAddress->getName()] = type;
         //cout << "DeclareVarInst " << fAddress->getName() << " " << Typed::gTypeString[type->getType()] << endl;
+        gGlobal->gVarTypeTable[fAddress->getName()] = type;
     } else if (gGlobal->gVarTypeTable[fAddress->getName()] != type) {
-        //cout << "DeclareVarInst " << fAddress->getName() << endl;
-        //faustassert(false);
+        // If array type, check the internal type
+        ArrayTyped* type1 = dynamic_cast<ArrayTyped*>(gGlobal->gVarTypeTable[fAddress->getName()]);
+        ArrayTyped* type2 = dynamic_cast<ArrayTyped*>(type);
+        if (type1 && type2) {
+            faustassert(type1->fType == type2->fType);
+        } else {
+            faustassert(false);
+        }
     }
 }
 
@@ -64,7 +70,6 @@ DeclareFunInst::DeclareFunInst(const string& name, FunTyped* type, BlockInst* co
     if (gGlobal->gVarTypeTable.find(name) == gGlobal->gVarTypeTable.end()) {
         gGlobal->gVarTypeTable[name] = type->getTyped();
         //cout << "DeclareFunInst " << name << " " << Typed::gTypeString[type->getType()] << endl;
-        //stacktrace(20);
     } else if (gGlobal->gVarTypeTable[name] != type->getTyped()) {
         //cout << "DeclareFunInst " << name << endl;
         faustassert(false);
@@ -132,7 +137,10 @@ ValueInst* InstBuilder::genCastNumIntInst(ValueInst* inst)
 }
 
 // BasicTyped are not cloned, but actually point on the same underlying type
-Typed* BasicCloneVisitor::visit(BasicTyped* typed) { return gGlobal->gTypeTable[typed->fType]; }
+Typed* BasicCloneVisitor::visit(BasicTyped* typed)
+{
+    return gGlobal->gTypeTable[typed->fType];
+}
 
 void Typed::init()
 {
@@ -179,6 +187,7 @@ bool BlockInst::hasReturn()
     return dynamic_cast<RetInst*>(*it);
 }
 
+// Return the block value (if is has one) and remove it from the block
 ValueInst* BlockInst::getReturnValue()
 {
     list<StatementInst*>::const_iterator it = fCode.end(); it--;

diff --git a/compiler/generator/instructions.hh b/compiler/generator/instructions.hh
@@ -481,8 +481,7 @@ struct BasicTyped : public Typed {
 
     static void cleanup();
 
-    BasicTyped(VarType type)
-        :fType(type)
+    BasicTyped(VarType type):fType(type)
     {}
 
     VarType getType() { return fType; }

diff --git a/compiler/generator/llvm/llvm_code_container.cpp b/compiler/generator/llvm/llvm_code_container.cpp
@@ -701,6 +701,36 @@ void LLVMCodeContainer::generateGetSize(LlvmValue size)
     verifyFunction(*llvm_getSize);
 }
 
+void LLVMCodeContainer::generateFunMaps()
+{
+    if (gGlobal->gFastMath) {
+        generateFunMap("acos", "fast_acos", 1);
+        generateFunMap("asin", "fast_asin", 1);
+        generateFunMap("atan", "fast_atan", 1);
+        generateFunMap("atan2", "fast_atan2", 2);
+        generateFunMap("ceil", "fast_ceil", 1);
+        generateFunMap("cos", "fast_cos", 1);
+        generateFunMap("exp", "fast_exp", 1);
+        generateFunMap("exp2", "fast_exp2", 1);
+        generateFunMap("exp10", "fast_exp10", 1);
+        generateFunMap("floor", "fast_floor", 1);
+        generateFunMap("fmod", "fast_fmod", 2);
+        generateFunMap("log", "fast_log", 1);
+        generateFunMap("log2", "fast_log2", 1);
+        generateFunMap("log10", "fast_log10", 1);
+        generateFunMap("pow", "fast_pow", 2);
+        generateFunMap("remainder", "fast_remainder", 2);
+        generateFunMap("round", "fast_round", 1);
+        generateFunMap("sin", "fast_sin", 1);
+        generateFunMap("sqrt", "fast_sqrt", 1);
+        generateFunMap("tan", "fast_tan", 1);
+    } else {
+#ifdef __APPLE__
+        generateFunMap("exp10", "__exp10", 1, true);
+#endif
+    }
+}
+
 void LLVMCodeContainer::produceInternal()
 {
     // Creates DSP structure
@@ -714,6 +744,8 @@ void LLVMCodeContainer::produceInternal()
 
     fCodeProducer = new LLVMInstVisitor(fModule, fBuilder, fAllocaBuilder, fTypeBuilder.getFieldNames(), fTypeBuilder.getUIPtr(), fStructDSP, fKlassName);
 
+    generateFunMaps();
+
     generateInfoFunctions(fKlassName, false);
 
     // Global declarations
@@ -783,32 +815,7 @@ dsp_factory_base* LLVMCodeContainer::produceFactory()
 
     fCodeProducer = new LLVMInstVisitor(fModule, fBuilder, fAllocaBuilder, fields_names, fTypeBuilder.getUIPtr(), fStructDSP, fKlassName);
 
-    if (gGlobal->gFastMath) {
-        generateFunMap("acos", "fast_acos", 1);
-        generateFunMap("asin", "fast_asin", 1);
-        generateFunMap("atan", "fast_atan", 1);
-        generateFunMap("atan2", "fast_atan2", 2);
-        generateFunMap("ceil", "fast_ceil", 1);
-        generateFunMap("cos", "fast_cos", 1);
-        generateFunMap("exp", "fast_exp", 1);
-        generateFunMap("exp2", "fast_exp2", 1);
-        generateFunMap("exp10", "fast_exp10", 1);
-        generateFunMap("floor", "fast_floor", 1);
-        generateFunMap("fmod", "fast_fmod", 2);
-        generateFunMap("log", "fast_log", 1);
-        generateFunMap("log2", "fast_log2", 1);
-        generateFunMap("log10", "fast_log10", 1);
-        generateFunMap("pow", "fast_pow", 2);
-        generateFunMap("remainder", "fast_remainder", 2);
-        generateFunMap("round", "fast_round", 1);
-        generateFunMap("sin", "fast_sin", 1);
-        generateFunMap("sqrt", "fast_sqrt", 1);
-        generateFunMap("tan", "fast_tan", 1);
-    } else {
-    #ifdef __APPLE__
-        generateFunMap("exp10", "__exp10", 1, true);
-    #endif
-    }
+    generateFunMaps();
 
     generateInfoFunctions(fKlassName, true);
 

diff --git a/compiler/generator/llvm/llvm_code_container.hh b/compiler/generator/llvm/llvm_code_container.hh
@@ -147,6 +147,8 @@ class LLVMCodeContainer : public virtual CodeContainer {
 
         // To be used for mathematical function mapping (-fm and exp10 on OSX)
         void generateFunMap(const string& fun1_aux, const string& fun2_aux, int num_args, bool body = false);
+
+        void generateFunMaps();
 
     public:
-Original file line number
+Diff line change
@@ Expand Up / @@ -147,6 +147,8 @@ class LLVMCodeContainer : public virtual CodeContainer { @@
             // To be used for mathematical function mapping (-fm and exp10 on OSX)
             void generateFunMap(const string& fun1_aux, const string& fun2_aux, int num_args, bool body = false);
+            void generateFunMaps();
         public:
@@ Expand Down @@