Mercurial > hg > graal-jvmci-8

comparison src/share/vm/classfile/systemDictionary.cpp @ 20653:82d3e7b5277a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8065361: Fixup headers and definitions for INCLUDE_TRACE Reviewed-by: sla, stefank
author mgronlun
date Wed, 19 Nov 2014 18:14:01 +0100
parents b12a2a9b05ca
children 9fa3bf3043a2
comparison
equal deleted inserted replaced
20652:e8bf410d5e23 20653:82d3e7b5277a
62 #include "runtime/signature.hpp" 62 #include "runtime/signature.hpp"
63 #include "services/classLoadingService.hpp" 63 #include "services/classLoadingService.hpp"
64 #include "services/threadService.hpp" 64 #include "services/threadService.hpp"
65 #include "utilities/macros.hpp" 65 #include "utilities/macros.hpp"
66 #include "utilities/ticks.hpp" 66 #include "utilities/ticks.hpp"
67
68 #if INCLUDE_TRACE 67 #if INCLUDE_TRACE
69 #include "trace/tracing.hpp" 68 #include "trace/tracing.hpp"
70 #endif 69 #endif
71 70
72 Dictionary* SystemDictionary::_dictionary = NULL; 71 Dictionary* SystemDictionary::_dictionary = NULL;
73 PlaceholderTable* SystemDictionary::_placeholders = NULL; 72 PlaceholderTable* SystemDictionary::_placeholders = NULL;
74 Dictionary* SystemDictionary::_shared_dictionary = NULL; 73 Dictionary* SystemDictionary::_shared_dictionary = NULL;
2662 oop class_loader = initiating_loader.is_null() ? (oop)NULL : initiating_loader(); 2661 oop class_loader = initiating_loader.is_null() ? (oop)NULL : initiating_loader();
2663 event.set_initiatingClassLoader(class_loader != NULL ? 2662 event.set_initiatingClassLoader(class_loader != NULL ?
2664 class_loader->klass() : (Klass*)NULL); 2663 class_loader->klass() : (Klass*)NULL);
2665 event.commit(); 2664 event.commit();
2666 } 2665 }
2667 #endif /* INCLUDE_TRACE */ 2666 #endif // INCLUDE_TRACE
2668 } 2667 }
2669 2668
2670 #ifndef PRODUCT 2669 #ifndef PRODUCT
2671 2670
2672 // statistics code 2671 // statistics code