--- a/src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -27,7 +27,7 @@
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"

--- a/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/cpu/aarch64/templateTable_aarch64.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -29,7 +29,7 @@
 #include "interpreter/interpreterRuntime.hpp"
 #include "interpreter/interp_masm.hpp"
 #include "interpreter/templateTable.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/methodData.hpp"
 #include "oops/method.hpp"
 #include "oops/objArrayKlass.hpp"

--- a/src/hotspot/cpu/arm/interpreterRT_arm.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/cpu/arm/interpreterRT_arm.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"

--- a/src/hotspot/cpu/arm/templateTable_arm.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/cpu/arm/templateTable_arm.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -28,7 +28,7 @@
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
 #include "interpreter/templateTable.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/cpCache.hpp"
 #include "oops/methodData.hpp"
 #include "oops/objArrayKlass.hpp"

--- a/src/hotspot/cpu/ppc/interpreterRT_ppc.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/cpu/ppc/interpreterRT_ppc.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -28,7 +28,7 @@
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"

--- a/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/cpu/ppc/templateTable_ppc_64.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -30,7 +30,7 @@
 #include "interpreter/interp_masm.hpp"
 #include "interpreter/templateInterpreter.hpp"
 #include "interpreter/templateTable.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/methodHandles.hpp"

--- a/src/hotspot/cpu/s390/interpreterRT_s390.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/cpu/s390/interpreterRT_s390.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 SAP SE. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -28,7 +28,7 @@
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/icache.hpp"

--- a/src/hotspot/cpu/s390/templateTable_s390.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/cpu/s390/templateTable_s390.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -29,7 +29,7 @@
 #include "interpreter/interpreterRuntime.hpp"
 #include "interpreter/interp_masm.hpp"
 #include "interpreter/templateTable.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/methodHandles.hpp"

--- a/src/hotspot/cpu/sparc/interpreterRT_sparc.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/cpu/sparc/interpreterRT_sparc.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"

--- a/src/hotspot/cpu/sparc/templateTable_sparc.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/cpu/sparc/templateTable_sparc.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -27,7 +27,7 @@
 #include "interpreter/interpreterRuntime.hpp"
 #include "interpreter/interp_masm.hpp"
 #include "interpreter/templateTable.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/methodData.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "oops/oop.inline.hpp"

--- a/src/hotspot/cpu/x86/interpreterRT_x86_32.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/cpu/x86/interpreterRT_x86_32.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"

--- a/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/cpu/x86/interpreterRT_x86_64.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -26,7 +26,7 @@
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"

--- a/src/hotspot/cpu/x86/templateTable_x86.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/cpu/x86/templateTable_x86.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -28,7 +28,7 @@
 #include "interpreter/interpreterRuntime.hpp"
 #include "interpreter/interp_masm.hpp"
 #include "interpreter/templateTable.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/methodData.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "oops/oop.inline.hpp"

--- a/src/hotspot/cpu/zero/interpreterRT_zero.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/cpu/zero/interpreterRT_zero.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2007, 2008, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -27,7 +27,7 @@
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterRuntime.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"

--- a/src/hotspot/share/ci/ciEnv.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/ci/ciEnv.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -45,7 +45,7 @@
 #include "memory/allocation.inline.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/constantPool.inline.hpp"
 #include "oops/cpCache.inline.hpp"
 #include "oops/method.inline.hpp"

--- a/src/hotspot/share/ci/ciField.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/ci/ciField.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
 #include "classfile/systemDictionary.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "interpreter/linkResolver.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/fieldDescriptor.hpp"
 

--- a/src/hotspot/share/classfile/classFileParser.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/classfile/classFileParser.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -44,7 +44,7 @@
 #include "memory/metadataFactory.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/annotations.hpp"
 #include "oops/constantPool.inline.hpp"
 #include "oops/fieldStreams.hpp"
@@ -3767,9 +3767,7 @@
   int next_static_oop_offset    = InstanceMirrorKlass::offset_of_static_fields();
   int next_static_double_offset = next_static_oop_offset +
                                       ((fac->count[STATIC_OOP]) * heapOopSize);
-  if ( fac->count[STATIC_DOUBLE] &&
-       (Universe::field_type_should_be_aligned(T_DOUBLE) ||
-        Universe::field_type_should_be_aligned(T_LONG)) ) {
+  if (fac->count[STATIC_DOUBLE]) {
     next_static_double_offset = align_up(next_static_double_offset, BytesPerLong);
   }
 

--- a/src/hotspot/share/classfile/classLoader.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/classfile/classLoader.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -48,7 +48,7 @@
 #include "memory/filemap.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/instanceRefKlass.hpp"
 #include "oops/method.inline.hpp"

--- a/src/hotspot/share/classfile/javaClasses.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/classfile/javaClasses.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -38,7 +38,7 @@
 #include "memory/oopFactory.hpp"
 #include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/fieldStreams.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/instanceMirrorKlass.hpp"

--- a/src/hotspot/share/code/icBuffer.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/code/icBuffer.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@
 #include "interpreter/interpreter.hpp"
 #include "interpreter/linkResolver.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/mutexLocker.hpp"

--- a/src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -36,7 +36,7 @@
 #include "logging/logStream.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/handles.inline.hpp"

--- a/src/hotspot/share/gc/shared/space.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/gc/shared/space.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -33,7 +33,7 @@
 #include "gc/shared/space.hpp"
 #include "gc/shared/space.inline.hpp"
 #include "gc/shared/spaceDecorator.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/java.hpp"

--- a/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/gc/shared/threadLocalAllocBuffer.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
 #include "gc/shared/threadLocalAllocBuffer.inline.hpp"
 #include "logging/log.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/thread.inline.hpp"
 #include "runtime/threadSMR.hpp"

--- a/src/hotspot/share/interpreter/interpreterRuntime.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -37,7 +37,7 @@
 #include "logging/log.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/constantPool.hpp"
 #include "oops/cpCache.inline.hpp"
 #include "oops/instanceKlass.hpp"

--- a/src/hotspot/share/interpreter/linkResolver.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/interpreter/linkResolver.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -38,7 +38,7 @@
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/cpCache.inline.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/method.hpp"

--- a/src/hotspot/share/jvmci/jvmciEnv.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/jvmci/jvmciEnv.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -37,7 +37,7 @@
 #include "memory/allocation.inline.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/constantPool.inline.hpp"
 #include "oops/cpCache.inline.hpp"
 #include "oops/method.inline.hpp"

--- a/src/hotspot/share/memory/oopFactory.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/memory/oopFactory.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -30,7 +30,7 @@
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/instanceOop.hpp"
 #include "oops/objArrayOop.hpp"

--- a/src/hotspot/share/memory/universe.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/memory/universe.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -49,7 +49,7 @@
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/constantPool.hpp"
 #include "oops/instanceClassLoaderKlass.hpp"
 #include "oops/instanceKlass.hpp"

--- a/src/hotspot/share/memory/universe.hpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/memory/universe.hpp	Wed Mar 07 21:57:36 2018 +0100
@@ -462,8 +462,6 @@
   static bool is_module_initialized()                 { return _module_initialized; }
   static bool is_fully_initialized()                  { return _fully_initialized; }
 
-  static inline bool element_type_should_be_aligned(BasicType type);
-  static inline bool field_type_should_be_aligned(BasicType type);
   static bool        on_page_boundary(void* addr);
   static bool        should_fill_in_stack_trace(Handle throwable);
   static void check_alignment(uintx size, uintx alignment, const char* name);

--- a/src/hotspot/share/memory/universe.inline.hpp	Wed Mar 07 19:32:54 2018 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_VM_MEMORY_UNIVERSE_INLINE_HPP
-#define SHARE_VM_MEMORY_UNIVERSE_INLINE_HPP
-
-#include "memory/universe.hpp"
-
-// Check whether an element of a typeArrayOop with the given type must be
-// aligned 0 mod 8.  The typeArrayOop itself must be aligned at least this
-// strongly.
-
-inline bool Universe::element_type_should_be_aligned(BasicType type) {
-  return type == T_DOUBLE || type == T_LONG;
-}
-
-// Check whether an object field (static/non-static) of the given type must be aligned 0 mod 8.
-
-inline bool Universe::field_type_should_be_aligned(BasicType type) {
-  return type == T_DOUBLE || type == T_LONG;
-}
-
-#endif // SHARE_VM_MEMORY_UNIVERSE_INLINE_HPP

--- a/src/hotspot/share/oops/arrayKlass.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/oops/arrayKlass.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
 #include "jvmtifiles/jvmti.h"
 #include "memory/metaspaceClosure.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/arrayKlass.hpp"
 #include "oops/arrayOop.hpp"
 #include "oops/instanceKlass.hpp"

--- a/src/hotspot/share/oops/arrayOop.hpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/oops/arrayOop.hpp	Wed Mar 07 21:57:36 2018 +0100
@@ -25,7 +25,7 @@
 #ifndef SHARE_VM_OOPS_ARRAYOOP_HPP
 #define SHARE_VM_OOPS_ARRAYOOP_HPP
 
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.hpp"
 #include "utilities/align.hpp"
 
@@ -62,6 +62,13 @@
     return (int)hs;
   }
 
+  // Check whether an element of a typeArrayOop with the given type must be
+  // aligned 0 mod 8.  The typeArrayOop itself must be aligned at least this
+  // strongly.
+  static bool element_type_should_be_aligned(BasicType type) {
+    return type == T_DOUBLE || type == T_LONG;
+  }
+
  public:
   // The _length field is not declared in C++.  It is allocated after the
   // declared nonstatic fields in arrayOopDesc if not compressed, otherwise
@@ -99,7 +106,7 @@
   // array object type.
   static int header_size(BasicType type) {
     size_t typesize_in_bytes = header_size_in_bytes();
-    return (int)(Universe::element_type_should_be_aligned(type)
+    return (int)(element_type_should_be_aligned(type)
       ? align_object_offset(typesize_in_bytes/HeapWordSize)
       : typesize_in_bytes/HeapWordSize);
   }

--- a/src/hotspot/share/oops/cpCache.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/oops/cpCache.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -32,7 +32,7 @@
 #include "memory/metadataFactory.hpp"
 #include "memory/metaspaceClosure.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/constantPool.inline.hpp"
 #include "oops/cpCache.inline.hpp"

--- a/src/hotspot/share/oops/generateOopMap.hpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/oops/generateOopMap.hpp	Wed Mar 07 21:57:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
 
 #include "interpreter/bytecodeStream.hpp"
 #include "memory/allocation.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/method.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "runtime/signature.hpp"

--- a/src/hotspot/share/oops/klassVtable.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/oops/klassVtable.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -31,7 +31,7 @@
 #include "logging/logStream.hpp"
 #include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/klassVtable.hpp"
 #include "oops/method.hpp"

--- a/src/hotspot/share/oops/objArrayKlass.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/oops/objArrayKlass.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
 #include "memory/metadataFactory.hpp"
 #include "memory/metaspaceClosure.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/arrayKlass.inline.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/klass.inline.hpp"

--- a/src/hotspot/share/oops/typeArrayKlass.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/oops/typeArrayKlass.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,7 +33,7 @@
 #include "memory/metadataFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/arrayKlass.inline.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/klass.inline.hpp"

--- a/src/hotspot/share/opto/parse2.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/opto/parse2.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -29,7 +29,7 @@
 #include "compiler/compileLog.hpp"
 #include "interpreter/linkResolver.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "opto/addnode.hpp"
 #include "opto/castnode.hpp"

--- a/src/hotspot/share/opto/parse3.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/opto/parse3.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
 #include "precompiled.hpp"
 #include "compiler/compileLog.hpp"
 #include "interpreter/linkResolver.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "opto/addnode.hpp"
 #include "opto/castnode.hpp"

--- a/src/hotspot/share/precompiled/precompiled.hpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/precompiled/precompiled.hpp	Wed Mar 07 21:57:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -138,7 +138,7 @@
 # include "memory/oopFactory.hpp"
 # include "memory/resourceArea.hpp"
 # include "memory/universe.hpp"
-# include "memory/universe.inline.hpp"
+# include "memory/universe.hpp"
 # include "memory/virtualspace.hpp"
 # include "oops/array.hpp"
 # include "oops/arrayKlass.hpp"

--- a/src/hotspot/share/prims/forte.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/prims/forte.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -27,7 +27,7 @@
 #include "code/pcDesc.hpp"
 #include "gc/shared/collectedHeap.inline.hpp"
 #include "gc/shared/space.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/forte.hpp"
 #include "runtime/javaCalls.hpp"

--- a/src/hotspot/share/prims/jni.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/prims/jni.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -42,7 +42,7 @@
 #include "memory/allocation.inline.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/arrayOop.inline.hpp"
 #include "oops/instanceKlass.hpp"

--- a/src/hotspot/share/prims/jvm.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/prims/jvm.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -39,7 +39,7 @@
 #include "interpreter/bytecode.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/access.inline.hpp"
 #include "oops/fieldStreams.hpp"
 #include "oops/instanceKlass.hpp"

--- a/src/hotspot/share/prims/jvmtiEnv.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/prims/jvmtiEnv.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -35,7 +35,7 @@
 #include "logging/log.hpp"
 #include "logging/logConfiguration.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/objArrayOop.inline.hpp"
 #include "oops/oop.inline.hpp"

--- a/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -25,7 +25,7 @@
 #include "precompiled.hpp"
 #include "classfile/systemDictionary.hpp"
 #include "gc/shared/collectedHeap.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "prims/jvmtiGetLoadedClasses.hpp"
 #include "runtime/jniHandles.inline.hpp"
 #include "runtime/thread.hpp"

--- a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -37,7 +37,7 @@
 #include "memory/metadataFactory.hpp"
 #include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/fieldStreams.hpp"
 #include "oops/klassVtable.hpp"
 #include "oops/oop.inline.hpp"

--- a/src/hotspot/share/prims/nativeLookup.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/prims/nativeLookup.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
 #include "classfile/vmSymbols.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/method.hpp"
 #include "oops/oop.inline.hpp"

--- a/src/hotspot/share/runtime/arguments.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/runtime/arguments.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -38,7 +38,7 @@
 #include "logging/logStream.hpp"
 #include "logging/logTag.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "runtime/arguments.hpp"

--- a/src/hotspot/share/runtime/fieldDescriptor.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/runtime/fieldDescriptor.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -26,7 +26,7 @@
 #include "classfile/systemDictionary.hpp"
 #include "classfile/vmSymbols.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/annotations.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/oop.inline.hpp"

--- a/src/hotspot/share/runtime/frame.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/runtime/frame.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
 #include "interpreter/interpreter.hpp"
 #include "interpreter/oopMapCache.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/markOop.hpp"
 #include "oops/method.hpp"
 #include "oops/methodData.hpp"

--- a/src/hotspot/share/runtime/javaCalls.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/runtime/javaCalls.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -29,7 +29,7 @@
 #include "compiler/compileBroker.hpp"
 #include "interpreter/interpreter.hpp"
 #include "interpreter/linkResolver.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/method.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/jniCheck.hpp"

--- a/src/hotspot/share/runtime/reflection.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/runtime/reflection.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
 #include "interpreter/linkResolver.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/objArrayKlass.hpp"
 #include "oops/objArrayOop.inline.hpp"

--- a/src/hotspot/share/runtime/reflectionUtils.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/runtime/reflectionUtils.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 
 #include "precompiled.hpp"
 #include "classfile/javaClasses.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "runtime/reflectionUtils.hpp"
 
 KlassStream::KlassStream(InstanceKlass* klass, bool local_only,

--- a/src/hotspot/share/runtime/relocator.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/runtime/relocator.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
 #include "interpreter/bytecodes.hpp"
 #include "memory/metadataFactory.hpp"
 #include "memory/oopFactory.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/relocator.hpp"

--- a/src/hotspot/share/runtime/safepoint.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/runtime/safepoint.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -40,7 +40,7 @@
 #include "logging/log.hpp"
 #include "logging/logStream.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/oop.inline.hpp"
 #include "oops/symbol.hpp"
 #include "runtime/atomic.hpp"

--- a/src/hotspot/share/runtime/sharedRuntime.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -41,7 +41,7 @@
 #include "logging/log.hpp"
 #include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/klass.hpp"
 #include "oops/method.inline.hpp"
 #include "oops/objArrayKlass.hpp"

--- a/src/hotspot/share/runtime/thread.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/runtime/thread.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -46,7 +46,7 @@
 #include "memory/metaspaceShared.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/instanceKlass.hpp"
 #include "oops/objArrayOop.hpp"
 #include "oops/oop.inline.hpp"

--- a/src/hotspot/share/runtime/vframeArray.cpp	Wed Mar 07 19:32:54 2018 -0800
+++ b/src/hotspot/share/runtime/vframeArray.cpp	Wed Mar 07 21:57:36 2018 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
 #include "interpreter/interpreter.hpp"
 #include "memory/allocation.inline.hpp"
 #include "memory/resourceArea.hpp"
-#include "memory/universe.inline.hpp"
+#include "memory/universe.hpp"
 #include "oops/methodData.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/jvmtiThreadState.hpp"