Address Richard's latest feedback.

llvm-svn: 213404

1 files changed, 7 insertions, 8 deletions

diff --git a/clang/lib/CodeGen/CGExprCXX.cpp b/clang/lib/CodeGen/CGExprCXX.cpp
index 768fab726b0..5c4e1f1266d 100644
--- a/clang/lib/CodeGen/CGExprCXX.cpp
+++ b/clang/lib/CodeGen/CGExprCXX.cpp
@@ -1628,14 +1628,9 @@ static bool isGLValueFromPointerDeref(const Expr *E) {
     if (BO->getOpcode() == BO_Comma)
       return isGLValueFromPointerDeref(BO->getRHS());
 
-  if (const auto *CO = dyn_cast<ConditionalOperator>(E))
-    return isGLValueFromPointerDeref(CO->getTrueExpr()) ||
-           isGLValueFromPointerDeref(CO->getFalseExpr());
-
-  if (const auto *BCO = dyn_cast<BinaryConditionalOperator>(E))
-    if (const auto *OVE = dyn_cast<OpaqueValueExpr>(BCO->getTrueExpr()))
-      return isGLValueFromPointerDeref(OVE->getSourceExpr()) ||
-             isGLValueFromPointerDeref(BCO->getFalseExpr());
+  if (const auto *ACO = dyn_cast<AbstractConditionalOperator>(E))
+    return isGLValueFromPointerDeref(ACO->getTrueExpr()) ||
+           isGLValueFromPointerDeref(ACO->getFalseExpr());
 
   // C++11 [expr.sub]p1:
   //   The expression E1[E2] is identical (by definition) to *((E1)+(E2))
@@ -1658,6 +1653,10 @@ static llvm::Value *EmitTypeidFromVTable(CodeGenFunction &CGF, const Expr *E,
   //   If the glvalue expression is obtained by applying the unary * operator to
   //   a pointer and the pointer is a null pointer value, the typeid expression
   //   throws the std::bad_typeid exception.
+  //
+  // However, this paragraph's intent is not clear.  We choose a very generous
+  // interpretation which implores us to consider comma operators, conditional
+  // operators, parentheses and other such constructs.
   QualType SrcRecordTy = E->getType();
   if (CGF.CGM.getCXXABI().shouldTypeidBeNullChecked(
           isGLValueFromPointerDeref(E), SrcRecordTy)) {