aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/AST/ASTContext.cpp4
-rw-r--r--test/CodeGen/volatile.c7
2 files changed, 10 insertions, 1 deletions
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
index 37ef59cc36..e9ca7ddb48 100644
--- a/lib/AST/ASTContext.cpp
+++ b/lib/AST/ASTContext.cpp
@@ -5606,6 +5606,10 @@ bool ASTContext::DeclMustBeEmitted(const Decl *D) {
if (VD->isThisDeclarationADefinition() == VarDecl::DeclarationOnly)
return false;
+ // Always emit volatiles.
+ if (VD->getType().isVolatileQualified())
+ return true;
+
// Structs that have non-trivial constructors or destructors are required.
// FIXME: Handle references.
diff --git a/test/CodeGen/volatile.c b/test/CodeGen/volatile.c
index 1a996defcf..a6c17b0041 100644
--- a/test/CodeGen/volatile.c
+++ b/test/CodeGen/volatile.c
@@ -1,6 +1,7 @@
// RUN: %clang_cc1 -emit-llvm < %s -o %t
// RUN: grep volatile %t | count 28
// RUN: grep memcpy %t | count 7
+// RUN: %clang_cc1 %s -Wall -verify -emit-llvm -o - | FileCheck %s
// The number 28 comes from the current codegen for volatile loads;
// if this number changes, it's not necessarily something wrong, but
@@ -96,5 +97,9 @@ int main() {
(void)vF2;
vF2 = vF2;
vF2 = vF2 = vF2;
- vF2 = (vF2, vF2);
+ vF2 = (vF2, vF2); // expected-warning {{expression result unused}}
}
+
+// Make sure this is emitted. rdar://8315219
+// CHECK: @gvx
+static volatile int gvx = 0;