Tidy up safe_load

stefank · stefank · commit 1d9d9099f2e1 · 2022-03-30T14:01:57.000+02:00
diff --git a/src/hotspot/share/oops/instanceStackChunkKlass.cpp b/src/hotspot/share/oops/instanceStackChunkKlass.cpp
@@ -211,11 +211,10 @@ void InstanceStackChunkKlass::oop_oop_iterate_stack_slow(stackChunkOop chunk, Oo
 }
 
 #ifdef ASSERT
-template<class P>
-static inline oop safe_load(P *addr) {
-  oop obj = (oop)RawAccess<>::oop_load(addr);
-  obj = (oop)NativeAccess<>::oop_load(&obj);
-  return obj;
+template <typename P>
+static inline oop safe_load(P* addr) {
+  oop obj = RawAccess<>::oop_load(addr);
+  return NativeAccess<>::oop_load(&obj);
 }
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -211,11 +211,10 @@ void InstanceStackChunkKlass::oop_oop_iterate_stack_slow(stackChunkOop chunk, Oo`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`#ifdef ASSERT`
`214`		`-template<class P>`
`215`		`-static inline oop safe_load(P *addr) {`
`216`		`- oop obj = (oop)RawAccess<>::oop_load(addr);`
`217`		`- obj = (oop)NativeAccess<>::oop_load(&obj);`
`218`		`- return obj;`
	`214`	`+template <typename P>`
	`215`	`+static inline oop safe_load(P* addr) {`
	`216`	`+ oop obj = RawAccess<>::oop_load(addr);`
	`217`	`+ return NativeAccess<>::oop_load(&obj);`
`219`	`218`	`}`
`220`	`219`	`#endif`
`221`	`220`