[SemaExpr] Fix type checking for default-lvalue conversions that invo…

…lve hyperobjects.

clang/lib/Sema/SemaExpr.cpp

@@ -652,7 +652,7 @@ ExprResult Sema::DefaultLvalueConversion(Expr *E) {
   //   converted to a prvalue.
   if (!E->isGLValue()) return E;
 
-  QualType T = E->getType();
+  QualType T = E->getType().stripHyperobject();
   assert(!T.isNull() && "r-value conversion on typeless expression?");
 
   // lvalue-to-rvalue conversion cannot be applied to function or array types.
@@ -687,7 +687,7 @@ ExprResult Sema::DefaultLvalueConversion(Expr *E) {
   CheckForNullPointerDereference(*this, E);
 
   E = BuildHyperobjectLookup(E);
-  T = E->getType();
+  assert(T == E->getType() && "Unexpected Type from hyperobject lookup.");
 
   if (const ObjCIsaExpr *OISA = dyn_cast<ObjCIsaExpr>(E->IgnoreParenCasts())) {
     NamedDecl *ObjectGetClass = LookupSingleName(TUScope,

clang/test/Cilk/hyper-type-delete.cpp

@@ -0,0 +1,15 @@
+// Check that calling delete on a hyperobject produces a useful error message.
+//
+// RUN: %clang_cc1 %s -xc++ -fopencilk -verify -fsyntax-only
+struct S {
+    int x, y;
+};
+void identity(void *v);
+void reduce(void *l, void *r);
+using S_r = S _Hyperobject(identity, reduce);
+
+class Foo {
+    S_r r; // expected-warning{{reducer callbacks not implemented for structure members}}
+public:
+    ~Foo() { delete r; }; // expected-error{{cannot delete expression of type 'S_r' (aka 'S _Hyperobject(identity, reduce)')}}
+};