--- old/src/hotspot/share/utilities/exceptions.hpp	2019-04-04 15:12:07.598053953 -0700
+++ new/src/hotspot/share/utilities/exceptions.hpp	2019-04-04 15:12:06.978032773 -0700
@@ -237,11 +237,7 @@
 // visible within the scope containing the THROW. Usually this is achieved by declaring the function
 // with a TRAPS argument.
 
-#ifdef THIS_FILE
 #define THREAD_AND_LOCATION                      THREAD, THIS_FILE, __LINE__
-#else
-#define THREAD_AND_LOCATION                      THREAD, __FILE__, __LINE__
-#endif
 
 #define THROW_OOP(e)                                \
   { Exceptions::_throw_oop(THREAD_AND_LOCATION, e);                             return;  }