From 4689707f556bc20175adfc1e77112aa8367a2e1b Mon Sep 17 00:00:00 2001
From: rdurbin <unknown>
Date: Wed, 20 Mar 2013 20:44:54 -0700
Subject: [PATCH] 8010396: checking MallocMaxTestWords in testMalloc() function
 is redundant Summary: Remove redundant checks in testMalloc and add assert.
 Reviewed-by: dcubed, coleenp, dholmes

---
 src/share/vm/runtime/os.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/share/vm/runtime/os.cpp b/src/share/vm/runtime/os.cpp
index 05fa2d07e..aff49e806 100644
--- a/src/share/vm/runtime/os.cpp
+++ b/src/share/vm/runtime/os.cpp
@@ -577,15 +577,15 @@ void verify_block(void* memblock) {
 // condition without really running the system out of memory.
 //
 static u_char* testMalloc(size_t alloc_size) {
+  assert(MallocMaxTestWords > 0, "sanity check");
 
-  if (MallocMaxTestWords > 0 &&
-      (cur_malloc_words + (alloc_size / BytesPerWord)) > MallocMaxTestWords) {
+  if ((cur_malloc_words + (alloc_size / BytesPerWord)) > MallocMaxTestWords) {
     return NULL;
   }
 
   u_char* ptr = (u_char*)::malloc(alloc_size);
 
-  if (MallocMaxTestWords > 0 && (ptr != NULL)) {
+  if (ptr != NULL) {
     Atomic::add(((jint) (alloc_size / BytesPerWord)),
                 (volatile jint *) &cur_malloc_words);
   }
-- 
GitLab