aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/CodeGen/CodeGenModule.cpp6
-rw-r--r--test/CodeGenCXX/static-assert.cpp3
2 files changed, 8 insertions, 1 deletions
diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index 5c12c81b36..8ca1be42e7 100644
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -1481,7 +1481,11 @@ void CodeGenModule::EmitTopLevelDecl(Decl *D) {
case Decl::CXXDestructor:
EmitCXXDestructors(cast<CXXDestructorDecl>(D));
break;
-
+
+ case Decl::StaticAssert:
+ // Nothing to do.
+ break;
+
// Objective-C Decls
// Forward declarations, no (immediate) code generation.
diff --git a/test/CodeGenCXX/static-assert.cpp b/test/CodeGenCXX/static-assert.cpp
new file mode 100644
index 0000000000..7757acd838
--- /dev/null
+++ b/test/CodeGenCXX/static-assert.cpp
@@ -0,0 +1,3 @@
+// RUN: clang-cc %s -emit-llvm -o - -std=c++0x
+
+static_assert(true, "");