--- a/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp	Thu Jan 28 16:30:37 2016 -0800
+++ b/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp	Wed Feb 03 01:35:25 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -264,7 +264,7 @@
     return true;
   }
   //climit = cache->length();  // %%% private!
-  size_t size = cache->size() * HeapWordSize;
+  size_t size = cache->size() * wordSize;
   size -= sizeof(ConstantPoolCache);
   size /= sizeof(ConstantPoolCacheEntry);
   climit = (int) size;