[ATTR] Automatic line feed after pragma-like attribute.

[ABataev]

Summary

Automatically insert line feed after pretty printing of all pragma-like attributes.

[aaron.ballman]

LGTM, thanks! If you would be so kind as to add a test for #pragma init_seg("bss"), that would be great -- it seems its printPrettyPragma never put a newline in there for that attribute, and so I would guess there's lacking test coverage that this change should fix.

~Aaron

[ABataev]

Ok, will do

Best regards,

Alexey Bataev

Software Engineer
Intel Compiler Team

08.10.2015 16:02, Aaron Ballman пишет:

aaron.ballman accepted this revision.
aaron.ballman added a comment.
This revision is now accepted and ready to land.

LGTM, thanks! If you would be so kind as to add a test for #pragma init_seg("bss"), that would be great -- it seems its printPrettyPragma never put a newline in there for that attribute, and so I would guess there's lacking test coverage that this change should fix.

~Aaron

http://reviews.llvm.org/D13546

[ABataev]

Printing of pragma-like attributes for declarations did not worked at all. Fixed it and added test for printing #pragma init_seg.

[aaron.ballman]

Wow, good catch on the fact that this didn't work at all! Thank you for tackling it.

lib/AST/DeclPrinter.cpp

197 ↗

(On Diff #36850)

Would it make more sense to add a prettyPrintPragmas(Decl *D) function instead?

test/SemaCXX/pragma-init_seg.cpp

1 ↗

(On Diff #36850)

I think this should be a new test under Misc\. We have ast-print-pragmas.cpp that looks like a good place for it to go.

[ABataev]

lib/AST/DeclPrinter.cpp

197 ↗

(On Diff #36850)

Ok, will do

test/SemaCXX/pragma-init_seg.cpp

1 ↗

(On Diff #36850)

Ok

[ABataev]

Update after review

[aaron.ballman]

Looks great, thank you!

~Aaron

include/clang/Basic/Attr.td

static const char *getOptionName(int Option) {
     }
     llvm_unreachable("Unhandled LoopHint option.");
   }
 
   void printPrettyPragma(raw_ostream &OS, const PrintingPolicy &Policy) const {
     unsigned SpellingIndex = getSpellingListIndex();
     // For "#pragma unroll" and "#pragma nounroll" the string "unroll" or
     // "nounroll" is already emitted as the pragma name.
-    if (SpellingIndex == Pragma_nounroll) {
-      OS << "\n";
+    if (SpellingIndex == Pragma_nounroll)
       return;
-    }
     else if (SpellingIndex == Pragma_unroll) {
-      OS << getValueString(Policy) << "\n";
+      OS << getValueString(Policy);
       return;
     }
 
     assert(SpellingIndex == Pragma_clang_loop && "Unexpected spelling");
-    OS << getOptionName(option) << getValueString(Policy) << "\n";
+    OS << getOptionName(option) << getValueString(Policy);
   }
 
   // Return a string containing the loop hint argument including the
   // enclosing parentheses.
   std::string getValueString(const PrintingPolicy &Policy) const {
     std::string ValueName;
     llvm::raw_string_ostream OS(ValueName);
     OS << "(";

utils/TableGen/ClangAttrEmitter.cpp

for (unsigned I = 0; I < Spellings.size(); ++ I) {
 
     OS <<
       "  case " << I << " : {\n"
       "    OS << \"" << Prefix << Spelling;
 
     if (Variety == "Pragma") {
       OS << " \";\n";
       OS << "    printPrettyPragma(OS, Policy);\n";
+      OS << "    OS << \"\\n\";";
       OS << "    break;\n";
       OS << "  }\n";
       continue;
     }
 
     // FIXME: always printing the parenthesis isn't the correct behavior for
     // attributes which have optional arguments that were not provided. For
     // instance: __attribute__((aligned)) will be pretty printed as