From 81ff3b7d935903483d01a643497000020d9da928 Mon Sep 17 00:00:00 2001
From: Jiangli Zhou <jiangli@openjdk.org>
Date: Wed, 8 Jun 2016 18:47:05 -0400
Subject: [PATCH] 8158681: ClassLoader::classloader_type() is called from code
 not included under #if INCLUDE_CDS

Place CDS related code under #if INCLUDE_CDS.

Reviewed-by: lfoltan, gtriantafill, coleenp
---
 hotspot/src/share/vm/classfile/classLoaderExt.hpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hotspot/src/share/vm/classfile/classLoaderExt.hpp b/hotspot/src/share/vm/classfile/classLoaderExt.hpp
index 24426d10552..6ce2275cc3b 100644
--- a/hotspot/src/share/vm/classfile/classLoaderExt.hpp
+++ b/hotspot/src/share/vm/classfile/classLoaderExt.hpp
@@ -54,12 +54,14 @@ public:
                                       const s2 classpath_index,
                                       instanceKlassHandle result, TRAPS) {
       if (ClassLoader::add_package(_file_name, classpath_index, THREAD)) {
+#if INCLUDE_CDS
         if (DumpSharedSpaces) {
           s2 classloader_type = ClassLoader::classloader_type(
                           class_name, e, classpath_index, CHECK_(result));
           result->set_shared_classpath_index(classpath_index);
           result->set_class_loader_type(classloader_type);
         }
+#endif
         return result;
       } else {
         return instanceKlassHandle(); // NULL