Fix newtype init/recursion/segfault bug

jckarter · Nov 19, 2012 · 02de32f · 02de32f
1 parent fb63da9
commit 02de32f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/compiler/analyzer.cpp b/compiler/analyzer.cpp
@@ -869,9 +869,9 @@ MultiPValuePtr analyzeStaticObject(ObjectPtr x)
     case NEW_TYPE_DECL : {
         NewTypeDecl *y = (NewTypeDecl *)x.ptr();
         assert(y->type->typeKind == NEW_TYPE);
-        initializeNewType((NewType*)y->type.ptr());
+        initializeNewType(y->type);
 
-        return new MultiPValue(PVData(y->type, true));
+        return new MultiPValue(PVData(y->type.ptr(), true));
     }
 
     case ENUM_MEMBER : {

diff --git a/compiler/clay.hpp b/compiler/clay.hpp
@@ -2004,7 +2004,7 @@ struct IntrinsicSymbol : public TopLevelItem {
 
 struct NewTypeDecl : public TopLevelItem {
     ExprPtr expr;
-    TypePtr type;
+    NewTypePtr type;
     TypePtr baseType;
     bool initialized:1;
     NewTypeDecl(Module *module, IdentifierPtr name,

diff --git a/compiler/types.cpp b/compiler/types.cpp
@@ -422,7 +422,7 @@ TypePtr newType(NewTypeDeclPtr newtype)
 {
     if (!newtype->type)
         newtype->type = new NewType(newtype);
-    return newtype->type;
+    return newtype->type.ptr();
 }
 
 TypePtr newtypeReprType(NewTypePtr t)
@@ -967,7 +967,7 @@ static void verifyRecursionCorrectness(TypePtr t,
     }
     case NEW_TYPE : {
         NewType *nt = (NewType *)t.ptr();
-        verifyRecursionCorrectness(nt->newtype->baseType, visited);
+        verifyRecursionCorrectness(newtypeReprType(nt), visited);
         break;
     }
     default :
@@ -1052,8 +1052,8 @@ llvm::Type *CCodePointerType::getCallType() {
 
 static void makeLLVMType(TypePtr t) {
     if (t->llType == NULL) {
-        declareLLVMType(t);
         verifyRecursionCorrectness(t);
+        declareLLVMType(t);
     }
     if (!t->defined) {
         defineLLVMType(t);