--- a/src/hotspot/share/utilities/macros.hpp	Fri Apr 12 09:13:50 2019 +0200
+++ b/src/hotspot/share/utilities/macros.hpp	Thu Apr 18 07:02:07 2019 -0400
@@ -279,8 +279,10 @@
 
 #if INCLUDE_JFR
 #define JFR_ONLY(code) code
+#define NOT_JFR_RETURN_(code) /* next token must be ; */
 #else
 #define JFR_ONLY(code)
+#define NOT_JFR_RETURN_(code) { return code; }
 #endif
 
 #ifndef INCLUDE_JVMCI