Change dyn_cast for reference types to be more like pointers and not need the canonical type. Also fix so that we're not expecting a return value from a void function
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@39954 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/AST/Type.cpp b/AST/Type.cpp
index 7b999fa..f083a73 100644
--- a/AST/Type.cpp
+++ b/AST/Type.cpp
@@ -73,7 +73,15 @@
}
bool Type::isReferenceType() const {
- return isa<ReferenceType>(CanonicalType);
+ // If this is directly a reference type, return it.
+ if (const ReferenceType *RTy = dyn_cast<ReferenceType>(this))
+ return RTy;
+
+ // If this is a typedef for a reference type, strip the typedef off without
+ // losing all typedef information.
+ if (isa<ReferenceType>(CanonicalType))
+ return cast<ReferenceType>(cast<TypedefType>(this)->LookThroughTypedefs());
+ return 0;
}
bool Type::isArrayType() const {
diff --git a/Sema/SemaExpr.cpp b/Sema/SemaExpr.cpp
index 93a2df9..952c83f 100644
--- a/Sema/SemaExpr.cpp
+++ b/Sema/SemaExpr.cpp
@@ -597,8 +597,10 @@
QualType t = e->getType();
assert(!t.isNull() && "DefaultFunctionArrayConversion - missing type");
- if (const ReferenceType *ref = dyn_cast<ReferenceType>(t.getCanonicalType()))
- t = promoteExprToType(e, ref->getReferenceeType()); // C++ [expr]
+ if (const ReferenceType *ref = dyn_cast<ReferenceType>(t)) {
+ promoteExprToType(e, ref->getReferenceeType()); // C++ [expr]
+ t = e->getType();
+ }
if (t->isFunctionType())
promoteExprToType(e, Context.getPointerType(t));
else if (const ArrayType *ary = dyn_cast<ArrayType>(t.getCanonicalType()))
@@ -614,8 +616,10 @@
QualType t = expr->getType();
assert(!t.isNull() && "UsualUnaryConversions - missing type");
- if (const ReferenceType *ref = dyn_cast<ReferenceType>(t.getCanonicalType()))
- t = promoteExprToType(expr, ref->getReferenceeType()); // C++ [expr]
+ if (const ReferenceType *ref = dyn_cast<ReferenceType>(t)) {
+ promoteExprToType(expr, ref->getReferenceeType()); // C++ [expr]
+ t = expr->getType();
+ }
if (t->isPromotableIntegerType()) // C99 6.3.1.1p2
promoteExprToType(expr, Context.IntTy);
else