Force namespace printing

Author: Fznamznon

clang/include/clang/AST/PrettyPrinter.h

@@ -76,6 +76,7 @@ struct PrintingPolicy {
         MSWChar(LO.MicrosoftExt && !LO.WChar), IncludeNewlines(true),
         MSVCFormatting(false), ConstantsAsWritten(false),
         SuppressImplicitBase(false), FullyQualifiedName(false),
+        EnforceScopeForElaboratedTypes(false),
         SuppressDefinition(false), SuppressDefaultTemplateArguments(false),
         PrintCanonicalTypes(false),
         SkipCanonicalizationOfTemplateTypeParms(false),
@@ -342,6 +343,10 @@ struct PrintingPolicy {
   LLVM_PREFERRED_TYPE(bool)
   unsigned FullyQualifiedName : 1;
 
+  /// Enforce fully qualified name printing for elaborated types.
+  LLVM_PREFERRED_TYPE(bool)
+  unsigned EnforceScopeForElaboratedTypes : 1;
+
   /// When true does not print definition of a type. E.g.
   ///   \code
   ///   template<typename T> class C0 : public C1 {...}

clang/lib/AST/TypePrinter.cpp

@@ -101,7 +101,7 @@ class ElaboratedTypePolicyRAII {
     SuppressTagKeyword = Policy.SuppressTagKeyword;
     SuppressScope = Policy.SuppressScope;
     Policy.SuppressTagKeyword = true;
-    Policy.SuppressScope = true;
+    Policy.SuppressScope = !Policy.EnforceScopeForElaboratedTypes;
   }
 
   ~ElaboratedTypePolicyRAII() {

clang/lib/Sema/SemaSYCL.cpp

@@ -6483,6 +6483,8 @@ void SYCLIntegrationHeader::emit(raw_ostream &O) {
     Policy.SuppressDefinition = true;
     Policy.PolishForDeclaration = true;
     Policy.EnforceDefaultTemplateArgs = true;
+    Policy.FullyQualifiedName = true;
+    Policy.EnforceScopeForElaboratedTypes = true;
     if (FTD) {
       FTD->print(O, Policy);
     } else {
@@ -6513,6 +6515,8 @@ void SYCLIntegrationHeader::emit(raw_ostream &O) {
     O << "}\n";
     Policy.SuppressDefaultTemplateArgs = true;
     Policy.EnforceDefaultTemplateArgs = false;
+    Policy.FullyQualifiedName = false;
+    Policy.EnforceScopeForElaboratedTypes = false;
 
     // Generate is_kernel, is_single_task_kernel and nd_range_kernel functions.
     O << "namespace sycl {\n";