Feature(compiler): Rework - passVariableDeclaration, independent from left.type

ovr · ovr · commit d4902b11f5a0 · 2018-12-15T14:13:18.000+09:00
diff --git a/src/backend/llvm/index.ts b/src/backend/llvm/index.ts
@@ -434,38 +434,33 @@ export function buildFromExpression(block: ts.Expression, ctx: Context, builder:
 }
 
 export function passVariableDeclaration(block: ts.VariableDeclaration, ctx: Context, builder: llvm.IRBuilder) {
-    if (block.initializer) {
-        const type = ctx.typeChecker.getTypeAtLocation(block);
-
-        const nativeType = NativeTypeResolver.getType(
-            type,
+    if (block.initializer && block.name.kind == ts.SyntaxKind.Identifier) {
+        const nativeTypeForDefaultValue = NativeTypeResolver.getType(
+            ctx.typeChecker.getTypeFromTypeNode(block.type),
             ctx
         );
 
-        const defaultValue = buildFromExpression(block.initializer, ctx, builder, nativeType);
-
-        if (block.name.kind == ts.SyntaxKind.Identifier) {
-            let allocate: llvm.AllocaInst;
-
-            if (defaultValue instanceof ObjectReference) {
-                allocate = defaultValue.getValue();
-            } else {
-                allocate = builder.createAlloca(
-                    nativeType.getType(),
-                    undefined,
-                    <string>block.name.escapedText
-                );
+        let allocate: llvm.AllocaInst;
 
-                builder.createStore(
-                    defaultValue.getValue(),
-                    allocate,
-                    false
-                );
-            }
+        const defaultValue = buildFromExpression(block.initializer, ctx, builder, nativeTypeForDefaultValue);
+        if (defaultValue instanceof ObjectReference) {
+            allocate = defaultValue.getValue();
+        } else {
+            allocate = builder.createAlloca(
+                defaultValue.getValue().type,
+                undefined,
+                <string>block.name.escapedText
+            );
 
-            ctx.scope.variables.set(<string>block.name.escapedText, new Primitive(allocate));
+            builder.createStore(
+                defaultValue.getValue(),
+                allocate,
+                false
+            );
         }
 
+        ctx.scope.variables.set(<string>block.name.escapedText, new Primitive(allocate));
+
         return;
     }
 
