Another take on annotations

Author: vgvassilev

clang/lib/Interpreter/InterpreterValuePrinter.cpp

@@ -640,15 +640,18 @@ llvm::Expected<Expr *> Interpreter::convertExprToValue(Expr *E) {
 using namespace clang;
 
 // Temporary rvalue struct that need special care.
-extern "C" void *REPL_EXTERNAL_VISIBILITY __clang_Interpreter_SetValueWithAlloc(
-    void *This, void *OutVal, void *OpaqueType) {
+extern "C" {
+REPL_EXTERNAL_VISIBILITY void *
+__clang_Interpreter_SetValueWithAlloc(void *This, void *OutVal,
+                                      void *OpaqueType) {
   Value &VRef = *(Value *)OutVal;
   VRef = Value(static_cast<Interpreter *>(This), OpaqueType);
   return VRef.getPtr();
 }
 
-extern "C" void REPL_EXTERNAL_VISIBILITY __clang_Interpreter_SetValueNoAlloc(
-    void *This, void *OutVal, void *OpaqueType, ...) {
+REPL_EXTERNAL_VISIBILITY void
+__clang_Interpreter_SetValueNoAlloc(void *This, void *OutVal, void *OpaqueType,
+                                    ...) {
   Value &VRef = *(Value *)OutVal;
   Interpreter *I = static_cast<Interpreter *>(This);
   VRef = Value(I, OpaqueType);
@@ -723,14 +726,15 @@ extern "C" void REPL_EXTERNAL_VISIBILITY __clang_Interpreter_SetValueNoAlloc(
   }
   va_end(args);
 }
+}
 
 // A trampoline to work around the fact that operator placement new cannot
 // really be forward declared due to libc++ and libstdc++ declaration mismatch.
 // FIXME: __clang_Interpreter_NewTag is ODR violation because we get the same
 // definition in the interpreter runtime. We should move it in a runtime header
 // which gets included by the interpreter and here.
 struct __clang_Interpreter_NewTag {};
-void *REPL_EXTERNAL_VISIBILITY
+REPL_EXTERNAL_VISIBILITY void *
 operator new(size_t __sz, void *__p, __clang_Interpreter_NewTag) noexcept {
   // Just forward to the standard operator placement new.
   return operator new(__sz, __p);