// Because the rewriter doesn't allow us to rewrite rewritten code,
// we need to suppress rewriting the sub-statements.
- Expr *Base, *RHS;
+ Expr *Base;
+ SmallVector<Expr*, 2> Args;
{
DisableReplaceStmtScope S(*this);
Base = cast<OpaqueValueExpr>(Base)->getSourceExpr();
Base = cast<Expr>(RewriteFunctionBodyOrGlobalInitializer(Base));
}
-
- // Rebuild the RHS.
- RHS = cast<BinaryOperator>(PseudoOp->getSyntacticForm())->getRHS();
- RHS = cast<OpaqueValueExpr>(RHS)->getSourceExpr();
- RHS = cast<Expr>(RewriteFunctionBodyOrGlobalInitializer(RHS));
+
+ unsigned numArgs = OldMsg->getNumArgs();
+ for (unsigned i = 0; i < numArgs; i++) {
+ Expr *Arg = OldMsg->getArg(i);
+ if (isa<OpaqueValueExpr>(Arg))
+ Arg = cast<OpaqueValueExpr>(Arg)->getSourceExpr();
+ Arg = cast<Expr>(RewriteFunctionBodyOrGlobalInitializer(Arg));
+ Args.push_back(Arg);
+ }
}
// TODO: avoid this copy.
OldMsg->getSelector(),
SelLocs,
OldMsg->getMethodDecl(),
- RHS,
+ Args,
OldMsg->getRightLoc(),
OldMsg->isImplicit());
break;
OldMsg->getSelector(),
SelLocs,
OldMsg->getMethodDecl(),
- RHS,
+ Args,
OldMsg->getRightLoc(),
OldMsg->isImplicit());
break;
OldMsg->getSelector(),
SelLocs,
OldMsg->getMethodDecl(),
- RHS,
+ Args,
OldMsg->getRightLoc(),
OldMsg->isImplicit());
break;
// Because the rewriter doesn't allow us to rewrite rewritten code,
// we need to suppress rewriting the sub-statements.
Expr *Base = 0;
+ SmallVector<Expr*, 1> Args;
{
DisableReplaceStmtScope S(*this);
-
// Rebuild the base expression if we have one.
if (OldMsg->getReceiverKind() == ObjCMessageExpr::Instance) {
Base = OldMsg->getInstanceReceiver();
Base = cast<OpaqueValueExpr>(Base)->getSourceExpr();
Base = cast<Expr>(RewriteFunctionBodyOrGlobalInitializer(Base));
}
+ unsigned numArgs = OldMsg->getNumArgs();
+ for (unsigned i = 0; i < numArgs; i++) {
+ Expr *Arg = OldMsg->getArg(i);
+ if (isa<OpaqueValueExpr>(Arg))
+ Arg = cast<OpaqueValueExpr>(Arg)->getSourceExpr();
+ Arg = cast<Expr>(RewriteFunctionBodyOrGlobalInitializer(Arg));
+ Args.push_back(Arg);
+ }
}
// Intentionally empty.
SmallVector<SourceLocation, 1> SelLocs;
- SmallVector<Expr*, 1> Args;
ObjCMessageExpr *NewMsg = 0;
switch (OldMsg->getReceiverKind()) {
--- /dev/null
+// RUN: %clang_cc1 -x objective-c++ -fblocks -fms-extensions -rewrite-objc %s -o %t-rw.cpp
+// RUN: %clang_cc1 -fsyntax-only -fblocks -Wno-address-of-temporary -D"Class=void*" -D"id=void*" -D"SEL=void*" -D"__declspec(X)=" %t-rw.cpp
+// rdar://11203853
+
+void *sel_registerName(const char *);
+
+typedef unsigned int size_t;
+@protocol P @end
+
+@interface NSMutableArray
+#if __has_feature(objc_subscripting)
+- (id)objectAtIndexedSubscript:(size_t)index;
+- (void)setObject:(id)object atIndexedSubscript:(size_t)index;
+#endif
+@end
+
+#if __has_feature(objc_subscripting)
+@interface XNSMutableArray
+- (id)objectAtIndexedSubscript:(size_t)index;
+- (void)setObject:(id)object atIndexedSubscript:(size_t)index;
+#endif
+@end
+
+@interface NSMutableDictionary
+- (id)objectForKeyedSubscript:(id)key;
+- (void)setObject:(id)object forKeyedSubscript:(id)key;
+@end
+
+@class NSString;
+
+int main() {
+ NSMutableArray<P> * array;
+ id oldObject = array[10];
+
+ array[10] = oldObject;
+
+ id unknown_array;
+ oldObject = unknown_array[1];
+
+ unknown_array[1] = oldObject;
+
+ NSMutableDictionary *dictionary;
+ NSString *key;
+ id newObject;
+ oldObject = dictionary[key];
+ dictionary[key] = newObject; // replace oldObject with newObject
+}
+