include Type context in error, and fix constant renaming lost in the shuffle of my clang-format undoing

Author: sophiapoirier

lib/Sema/TypeCheckType.cpp

@@ -3822,9 +3822,10 @@ TypeResolver::resolveDeclRefTypeRepr(DeclRefTypeRepr *repr,
 
     if (result && result->isParameterPack() &&
         options.contains(TypeResolutionFlags::FromPackExpansion) &&
-        !options.contains(TypeResolutionFlags::PackExpansionCompleted)) {
-      diagnose(repr->getLoc(), diag::pack_expansion_missing_pack_reference, repr);
-      return ErrorType::get(getASTContext());
+        !options.contains(TypeResolutionFlags::FromPackReference)) {
+      diagnose(repr->getLoc(), diag::pack_expansion_missing_pack_reference,
+               repr);
+      return ErrorType::get(result);
     }
   } else {
     result = resolveType(baseComp, options);
@@ -4306,7 +4307,7 @@ NeverNullType TypeResolver::resolvePackExpansionType(PackExpansionTypeRepr *repr
 NeverNullType TypeResolver::resolvePackReference(PackReferenceTypeRepr *repr,
                                                  TypeResolutionOptions options) {
   auto &ctx = getASTContext();
-  options |= TypeResolutionFlags::PackExpansionCompleted;
+  options |= TypeResolutionFlags::FromPackReference;
   auto packReference = resolveType(repr->getPackType(), options);
 
   // If we already failed, don't diagnose again.