commit cecd11d2af5d45d8ba322bed61fb48a99c305528
author Shih-wei Liao <sliao@google.com> Tue Sep 21 08:07:58 2010 -0700
committer Shih-wei Liao <sliao@google.com> Tue Sep 21 08:07:58 2010 -0700
tree 5f9fc29ab100231be14863b87fe6f57b1b31d68f
parent e14a2eab068a6d9c5c53a6fea73488a0aad6cad0

Fix warnings. Bug fix.

Change-Id: I80934814ae64d11f0edebfa3b131164207f1aca0

slang_rs_export_type.cpp

diff --git a/slang_rs_export_type.cpp b/slang_rs_export_type.cpp
index 088ed35..147a6ad 100644
--- a/slang_rs_export_type.cpp
+++ b/slang_rs_export_type.cpp
@@ -39,6 +39,7 @@
         else
             return T.getTypePtr();
     }
+    return NULL;
 }
 
 llvm::StringRef RSExportType::GetTypeName(const Type* T) {
@@ -577,21 +578,19 @@
 RSExportConstantArrayType* RSExportConstantArrayType::Create(RSContext* Context, const ConstantArrayType* CT, const llvm::StringRef& TypeName, DataKind DK, bool Normalized) {
     assert(CT != NULL && CT->getTypeClass() == Type::ConstantArray);
 
-    const Type* ElementType = GET_CONSTANT_ARRAY_ELEMENT_TYPE(CT);
-    //    RSExportPrimitiveType::DataType DT = RSExportPrimitiveType::GetDataType(ElementType);
-    int64_t siz = CT->getSize().getSExtValue();
+    int64_t Size = CT->getSize().getSExtValue();
     RSExportPrimitiveType::DataType DT;
-    if (siz == 4) {
+    if (Size == 4) {
       DT = RSExportPrimitiveType::DataTypeRSMatrix2x2;
-    } else if (siz == 9) {
+    } else if (Size == 9) {
       DT = RSExportPrimitiveType::DataTypeRSMatrix3x3;
-    } else if (siz == 16) {
+    } else if (Size == 16) {
       DT = RSExportPrimitiveType::DataTypeRSMatrix4x4;
     } else {
       printf("RSExportConstantArrayType::Create : unsupported base element type\n");
     }
 
-    return new RSExportConstantArrayType(Context, TypeName, DT, DK, Normalized, siz);
+    return new RSExportConstantArrayType(Context, TypeName, DT, DK, Normalized, Size);
 }
 
 RSExportType::ExportClass RSExportConstantArrayType::getClass() const {
@@ -692,6 +691,7 @@
         return new RSExportVectorType(Context, TypeName, DT, DK, Normalized, EVT->getNumElements());
     else
         printf("RSExportVectorType::Create : unsupported base element type\n");
+    return NULL;
 }
 
 RSExportType::ExportClass RSExportVectorType::getClass() const {