aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2009-07-06 15:38:40 +0000
committerDouglas Gregor <dgregor@apple.com>2009-07-06 15:38:40 +0000
commit6f4a69a3107e7ff1569c747f7c6bdf7cff8cbf55 (patch)
tree47b7ae4ffdae41434ad85d912607b4e14a284d2b
parent313b6dab9efcce465b68da0fed7bf422b6e5c375 (diff)
Fix bitfield promotion in the presence of explicit casts, from Abrama Bagnara.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@74830 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/AST/Expr.cpp2
-rw-r--r--test/Sema/bitfield-promote.c10
2 files changed, 11 insertions, 1 deletions
diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp
index 482e1062d8..50dfeebdbc 100644
--- a/lib/AST/Expr.cpp
+++ b/lib/AST/Expr.cpp
@@ -1458,7 +1458,7 @@ bool Expr::isNullPointerConstant(ASTContext &Ctx) const
}
FieldDecl *Expr::getBitField() {
- Expr *E = this->IgnoreParenCasts();
+ Expr *E = this->IgnoreParens();
if (MemberExpr *MemRef = dyn_cast<MemberExpr>(E))
if (FieldDecl *Field = dyn_cast<FieldDecl>(MemRef->getMemberDecl()))
diff --git a/test/Sema/bitfield-promote.c b/test/Sema/bitfield-promote.c
new file mode 100644
index 0000000000..42d4f5a196
--- /dev/null
+++ b/test/Sema/bitfield-promote.c
@@ -0,0 +1,10 @@
+// RUN: clang -fsyntax-only -Xclang -verify %s
+struct {unsigned x : 2;} x;
+__typeof__((x.x+=1)+1) y;
+__typeof__(x.x<<1) y;
+int y;
+
+
+struct { int x : 8; } x1;
+long long y1;
+__typeof__(((long long)x1.x + 1)) y1; \ No newline at end of file