Merge remote-tracking branch 'rajiv_fork/akp2' into add_inheritance_support_2

elizabethandrews · elizabethandrews · commit ed4d2f514bad · 2020-06-30T10:46:34.000-07:00
diff --git a/clang/lib/Sema/SemaSYCL.cpp b/clang/lib/Sema/SemaSYCL.cpp
@@ -1664,8 +1664,6 @@ class SyclKernelBodyCreator
   }
 
   bool nextElement(QualType ET) final {
-    if (ET->isScalarType())
-      return true;
     ArraySubscriptExpr *LastArrayRef =
         dyn_cast<ArraySubscriptExpr>(MemberExprBases.back());
     MemberExprBases.pop_back();

Original file line number	Diff line number	Diff line change
`@@ -1664,8 +1664,6 @@ class SyclKernelBodyCreator`
`1664`	`1664`	`}`
`1665`	`1665`
`1666`	`1666`	`bool nextElement(QualType ET) final {`
`1667`		`- if (ET->isScalarType())`
`1668`		`- return true;`
`1669`	`1667`	`ArraySubscriptExpr *LastArrayRef =`
`1670`	`1668`	`dyn_cast<ArraySubscriptExpr>(MemberExprBases.back());`
`1671`	`1669`	`MemberExprBases.pop_back();`