From 4254cdb7ed707b1ac48ec82b91047cbf4e6a45f7 Mon Sep 17 00:00:00 2001
From: Fariborz Jahanian <fjahanian@apple.com>
Date: Fri, 8 Feb 2013 18:57:50 +0000
Subject: [PATCH] objective-C modern translation: Fix another random
 translation bug involving property getter expressions on rhs of property
 setter. // rdar://13138459

llvm-svn: 174729
---
 clang/lib/Rewrite/Frontend/RewriteModernObjC.cpp   |  2 +
 .../test/Rewriter/objc-modern-property-bitfield.m  | 43 ++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 clang/test/Rewriter/objc-modern-property-bitfield.m

diff --git a/clang/lib/Rewrite/Frontend/RewriteModernObjC.cpp b/clang/lib/Rewrite/Frontend/RewriteModernObjC.cpp
index 4803bfa..ba5d669 100644
--- a/clang/lib/Rewrite/Frontend/RewriteModernObjC.cpp
+++ b/clang/lib/Rewrite/Frontend/RewriteModernObjC.cpp
@@ -5660,6 +5660,8 @@ Stmt *RewriteModernObjC::RewriteFunctionBodyOrGlobalInitializer(Stmt *S) {
   } else if (ObjCIvarRefExpr *IvarRefExpr = dyn_cast<ObjCIvarRefExpr>(S)) {
     return RewriteObjCIvarRefExpr(IvarRefExpr);
   }
+  else if (isa<OpaqueValueExpr>(S))
+    S = cast<OpaqueValueExpr>(S)->getSourceExpr();
 
   SourceRange OrigStmtRange = S->getSourceRange();
 
diff --git a/clang/test/Rewriter/objc-modern-property-bitfield.m b/clang/test/Rewriter/objc-modern-property-bitfield.m
new file mode 100644
index 0000000..583fa37
--- /dev/null
+++ b/clang/test/Rewriter/objc-modern-property-bitfield.m
@@ -0,0 +1,43 @@
+// RUN: %clang_cc1 -x objective-c++ -Wno-return-type -fms-extensions -rewrite-objc %s -o %t-modern-rw.cpp
+// RUN: %clang_cc1 -fsyntax-only -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-modern-rw.cpp
+// rdar://13138459
+
+void *sel_registerName(const char *);
+extern void abort();
+
+@interface NSObject 
++ alloc;
+- init;
+@end
+
+typedef unsigned char BOOL;
+
+@interface Foo : NSObject {
+
+   BOOL  _field1 : 5;
+   BOOL  _field2    : 3;
+}
+
+@property BOOL field1;
+@property BOOL field2;
+@end
+
+@implementation Foo
+
+@synthesize field1 = _field1;
+@synthesize field2 = _field2;
+
+@end
+
+int main()
+{
+  Foo *f = (Foo*)[[Foo alloc] init];
+  f.field1 = 0xF;
+  f.field2 = 0x3;
+  f.field1 = f.field1 & f.field2;
+  if (f.field1 != 0x3)
+    abort ();
+  return 0; 
+}
+
+
-- 
2.7.4