1 files changed, 4 insertions, 0 deletions
diff --git a/lib/CodeGen/ArrayHandler.cc b/lib/CodeGen/ArrayHandler.cc
index 6a89781..40a330f 100644
--- a/lib/CodeGen/ArrayHandler.cc
+++ b/lib/CodeGen/ArrayHandler.cc
@@ -33,6 +33,8 @@ void ArrayHandler::setupExternalFunctions() {
 }
 
 const ArrayMetadata *ArrayHandler::getMetadata(const std::string &Name) const {
+    auto Symbol = Symbols->find(Name);
+    if (Symbol == Symbols->end() || !Symbol->second.IsArray) return nullptr;
     auto It = ArrayTable.find(Name);
     if (It == ArrayTable.end()) {
         return nullptr;
@@ -93,6 +95,8 @@ void ArrayHandler::emitArrayDeclare(ArrayDeclareStmtAST *Stmt, CodeGen &CG) {
         return;
     }
 
+    if (!CG.prepareSymbolDeclaration(Name)) return;
+
     std::vector<Value*> Lows;
     std::vector<Value*> Highs;