Mercurial > hg > graal-jvmci-8
diff src/share/vm/compiler/disassembler.cpp @ 20804:7848fc12602b
Merge with jdk8u40-b25
author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
---|---|
date | Tue, 07 Apr 2015 14:58:49 +0200 |
parents | 52b4284cb496 094cbdffa87d |
children | 1621af5cb444 |
line wrap: on
line diff
--- a/src/share/vm/compiler/disassembler.cpp Tue Apr 07 11:20:51 2015 +0200 +++ b/src/share/vm/compiler/disassembler.cpp Tue Apr 07 14:58:49 2015 +0200 @@ -245,12 +245,12 @@ }; decode_env::decode_env(CodeBlob* code, outputStream* output, CodeStrings c) { - memset(this, 0, sizeof(*this)); + memset(this, 0, sizeof(*this)); // Beware, this zeroes bits of fields. _output = output ? output : tty; _code = code; if (code != NULL && code->is_nmethod()) _nm = (nmethod*) code; - _strings.assign(c); + _strings.copy(c); // by default, output pc but not bytes: _print_pc = true;