Merge branch 'master' into nvptx

2014-04-01 09:10:10 +02:00
parent 4c837d94a9 5a16b3eb10
commit fb581818c5
20 changed files with 448 additions and 105 deletions
--- a/type.cpp
+++ b/type.cpp
@@ -1909,7 +1909,15 @@ StructType::StructType(const std::string &n, const llvm::SmallVector<const Type

 const std::string 
 StructType::GetCStructName() const {
-  return lMangleStructName(name, variability);
+  // only return mangled name for varying structs for backwards
+  // compatibility...
+
+  if (variability == Variability::Varying) {
+    return lMangleStructName(name, variability);
+  }
+  else {
+    return GetStructName();
+  }
 }

 Variability