[cfe-commits] r44530 - in /cfe/trunk: AST/ASTContext.cpp test/Sema/cxx-references.cpp

[Bill Wendling]

Author: void
Date: Mon Dec  3 01:33:35 2007
New Revision: 44530

URL: http://llvm.org/viewvc/llvm-project?rev=44530&view=rev
Log:
Fix for testcase that assigns a dereferenced reference to a pointer. The
standard says that we should adjust the "reference to T" type to "T"
before analysis.


Modified:
    cfe/trunk/AST/ASTContext.cpp
    cfe/trunk/test/Sema/cxx-references.cpp

Modified: cfe/trunk/AST/ASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/AST/ASTContext.cpp?rev=44530&r1=44529&r2=44530&view=diff

==============================================================================
--- cfe/trunk/AST/ASTContext.cpp (original)
+++ cfe/trunk/AST/ASTContext.cpp Mon Dec  3 01:33:35 2007
@@ -1217,7 +1217,7 @@
   return typesAreCompatible(ltype, rtype);
 }
 
-// C++ 5.17p6: When the left opperand of an assignment operator denotes a
+// C++ 5.17p6: When the left operand of an assignment operator denotes a
 // reference to T, the operation assigns to the object of type T denoted by the
 // reference.
 bool ASTContext::referenceTypesAreCompatible(QualType lhs, QualType rhs) {
@@ -1299,6 +1299,15 @@
   // If two types are identical, they are are compatible
   if (lcanon == rcanon)
     return true;
+
+  // C++ [expr]: If an expression initially has the type "reference to T", the
+  // type is adjusted to "T" prior to any further analysis, the expression
+  // designates the object or function denoted by the reference, and the
+  // expression is an lvalue.
+  if (lcanon->getTypeClass() == Type::Reference)
+    lcanon = cast<ReferenceType>(lcanon)->getReferenceeType();
+  if (rcanon->getTypeClass() == Type::Reference)
+    rcanon = cast<ReferenceType>(rcanon)->getReferenceeType();
   
   // If the canonical type classes don't match, they can't be compatible
   if (lcanon->getTypeClass() != rcanon->getTypeClass()) {
@@ -1312,8 +1321,6 @@
   switch (lcanon->getTypeClass()) {
     case Type::Pointer:
       return pointerTypesAreCompatible(lcanon, rcanon);
-    case Type::Reference:
-      return referenceTypesAreCompatible(lcanon, rcanon);
     case Type::ConstantArray:
     case Type::VariableArray:
       return arrayTypesAreCompatible(lcanon, rcanon);

Modified: cfe/trunk/test/Sema/cxx-references.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/cxx-references.cpp?rev=44530&r1=44529&r2=44530&view=diff

==============================================================================
--- cfe/trunk/test/Sema/cxx-references.cpp (original)
+++ cfe/trunk/test/Sema/cxx-references.cpp Mon Dec  3 01:33:35 2007
@@ -5,9 +5,7 @@
   int i;
   int &r = i;
   r = 1;
-#if 0  // FIXME: &ref not right yet
   int *p = &r;
-#endif
   int &rr = r;
   int (&rg)(int) = g;
   rg(i);