Merge branch 'refl-parse' of https://github.com/changkhothuychung/llvm-project into refl-parse

Author: changkhothuychung

clang/include/clang/Basic/DiagnosticParseKinds.td

@@ -1851,7 +1851,7 @@ def err_placeholder_expected_auto_or_decltype_auto : Error<
   "expected 'auto' or 'decltype(auto)' after concept name">;
 }
 
-let CategoryName = "Reflection Issue" in {
+let CategoryName = "Reflection Diagnostics" in {
 def err_cannot_reflect_operand : Error<
   "expected reflectable entity">;
 }

clang/lib/Basic/OperatorPrecedence.cpp

@@ -54,6 +54,9 @@ prec::Level getBinOpPrecedence(tok::TokenKind Kind, bool GreaterThanIsOperator,
   case tok::pipepipe:             return prec::LogicalOr;
   case tok::ampamp:               return prec::LogicalAnd;
   case tok::pipe:                 return prec::InclusiveOr;
+  // this is for the case when ^^ appears where a binary operator is needed,
+  // and the first ^ is the actual binary operator,
+  // and the second is for a block.
   case tok::caretcaret:
   case tok::caret:                return prec::ExclusiveOr;
   case tok::amp:                  return prec::And;

clang/lib/Parse/ParseExpr.cpp

@@ -333,9 +333,10 @@ Parser::ParseRHSOfBinaryExpression(ExprResult LHS, prec::Level MinPrec) {
     Token OpToken = Tok;
     ConsumeToken();
 
-    // the reflection operator can't be in a binary expression
-    // so if reflection and blocks are enabled, we need to
-    // split caretcaret into two caret's
+    // The reflection operator is not valid here (i.e., in the place of the
+    // operator token in a binary expression), so if reflection and blocks are
+    // enabled, we split caretcaret into two carets: the first being the binary
+    // operator and the second being the introducer for the block.
     if (OpToken.is(tok::caretcaret)) {
       assert(getLangOpts().Reflection &&
              "reflection support disabled - compile with -freflection");