summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--clang/include/clang/AST/Decl.h2
-rw-r--r--clang/test/CodeGenCXX/static-data-member.cpp8
2 files changed, 9 insertions, 1 deletions
diff --git a/clang/include/clang/AST/Decl.h b/clang/include/clang/AST/Decl.h
index e8c29987b08..0fb7fc478d5 100644
--- a/clang/include/clang/AST/Decl.h
+++ b/clang/include/clang/AST/Decl.h
@@ -542,7 +542,7 @@ public:
if (isa<TranslationUnitDecl>(Ctx) || isa<NamespaceDecl>(Ctx) )
return true;
}
- if (isStaticDataMember() && isOutOfLine())
+ if (isStaticDataMember())
return true;
return false;
diff --git a/clang/test/CodeGenCXX/static-data-member.cpp b/clang/test/CodeGenCXX/static-data-member.cpp
new file mode 100644
index 00000000000..6e2abcc1ade
--- /dev/null
+++ b/clang/test/CodeGenCXX/static-data-member.cpp
@@ -0,0 +1,8 @@
+// RUN: clang-cc -emit-llvm -o - %s
+struct S {
+ static int i;
+};
+
+void f() {
+ int a = S::i;
+}
OpenPOWER on IntegriCloud