Correct NullDeclareVarInst implementation.

grame-cncm · Apr 9, 2024 · d2818ac · d2818ac
1 parent 62a6065
commit d2818ac
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/compiler/generator/code_container.cpp b/compiler/generator/code_container.cpp
@@ -415,7 +415,7 @@ void CodeContainer::processFIR(void)
         if (fIntControl->getSize() > 0 && fIntControl->fAccess == Address::kStruct) {
             pushDeclare(InstBuilder::genDecStructVar("iControl", InstBuilder::genArrayTyped(Typed::kInt32, fIntControl->getSize())));
         }
-        if (fRealControl->getSize() > 0 && fIntControl->fAccess == Address::kStruct) {
+        if (fRealControl->getSize() > 0 && fRealControl->fAccess == Address::kStruct) {
             pushDeclare(InstBuilder::genDecStructVar("fControl", InstBuilder::genArrayTyped(itfloat(), fRealControl->getSize())));
         }
     }

diff --git a/compiler/generator/fir/fir_instructions.hh b/compiler/generator/fir/fir_instructions.hh
@@ -268,6 +268,12 @@ class FIRInstVisitor : public InstVisitor, public CStringTypeManager {
         EndLine();
     }
 
+    virtual void visit(NullDeclareVarInst* inst)
+    {
+        *fOut << "NullDeclareVarInst()";
+        EndLine();
+    }
+
     // For Rust and Julia backends
     virtual void visit(DeclareBufferIterators* inst)
     {

diff --git a/compiler/generator/instructions.hh b/compiler/generator/instructions.hh
@@ -675,7 +675,8 @@ struct Address : public Printable {
         kVolatile     = 0x80,
         kReference    = 0x100,  // Access by reference (for Rust backend)
         kMutable      = 0x200,  // Mutable access (for Rust backend)
-        kConst        = 0x400   // Const access
+        kConst        = 0x400,  // Const access
+        kNoAccess     = 0x800   // Degenerated case used in NullDeclareVarInst
     };
 
     Address() {}
@@ -966,8 +967,13 @@ struct NullDeclareVarInst : public DeclareVarInst {
     NullDeclareVarInst():DeclareVarInst()
     {}
 
-    // Empty
-    void accept(InstVisitor* visitor) {}
+    void                setAccess(Address::AccessType access) {}
+    Address::AccessType getAccess() const  { return Address::kNoAccess; }
+
+    void   setName(const std::string& name) {}
+    std::string getName() const { return "NullDeclareVarInst"; }
+
+    void accept(InstVisitor* visitor) { visitor->visit(this); }
 
     StatementInst* clone(CloneVisitor* cloner) { return new NullStatementInst(); }
 };