1 files changed, 22 insertions, 4 deletions
diff --git a/clang/CodeGen/CodeGenFunction.cpp b/clang/CodeGen/CodeGenFunction.cpp
index 0283760dc99..ef80e51d0e3 100644
--- a/clang/CodeGen/CodeGenFunction.cpp
+++ b/clang/CodeGen/CodeGenFunction.cpp
@@ -81,10 +81,28 @@ const llvm::Type *CodeGenFunction::ConvertType(QualType T, SourceLocation Loc) {
     }
     break;
   }
-  case Type::Pointer:
-  case Type::Reference:
-  case Type::Array:
-    break;
+  case Type::Pointer: {
+    const PointerType &P = cast<PointerType>(Ty);
+    return llvm::PointerType::get(ConvertType(P.getPointeeType(), Loc));
+  }
+  case Type::Reference: {
+    const ReferenceType &R = cast<ReferenceType>(Ty);
+    return llvm::PointerType::get(ConvertType(R.getReferenceeType(), Loc));
+  }
+    
+  case Type::Array: {
+    const ArrayType &A = cast<ArrayType>(Ty);
+    assert(A.getSizeModifier() == ArrayType::Normal &&
+           A.getIndexTypeQualifier() == 0 &&
+           "FIXME: We only handle trivial array types so far!");
+    // FIXME: are there any promotions etc here?
+    ExprResult Size = EmitExpr(A.getSize());
+    assert(Size.isScalar() && isa<llvm::ConstantInt>(Size.getVal()) &&
+           "FIXME: Only handle fixed-size arrays so far");
+    const llvm::Type *EltTy = ConvertType(A.getElementType(), Loc);
+    return llvm::ArrayType::get(EltTy, 
+                      cast<llvm::ConstantInt>(Size.getVal())->getZExtValue());
+  }
   case Type::FunctionNoProto:
   case Type::FunctionProto: {
     const FunctionType &FP = cast<FunctionType>(Ty);