--- old/src/share/vm/opto/macro.cpp	2017-03-09 09:44:13.771623341 +0100
+++ new/src/share/vm/opto/macro.cpp	2017-03-09 09:44:09.874625793 +0100
@@ -831,8 +831,7 @@
   if (res != NULL) {
     klass = res_type->klass();
     // Value types are only allocated on demand
-    assert(!klass->is_valuetype(), "value type allocations should not be scalar replaceable");
-    if (res_type->isa_instptr()) {
+    if (res_type->isa_instptr() || res_type->isa_valuetypeptr()) {
       // find the fields of the class which will be needed for safepoint debug information
       assert(klass->is_instance_klass(), "must be an instance klass.");
       iklass = klass->as_instance_klass();