# HG changeset patch # User Gilles Duboscq # Date 1413454646 -7200 # Node ID 922e104f179a8ee477413ec6d3d65d9cd6c2f72a # Parent eaf39a954227d74d4ea8db4906be7226dc070a6d Fix merge of TemplateTable::generate_vtable_call for SPARC diff -r eaf39a954227 -r 922e104f179a src/cpu/sparc/vm/templateTable_sparc.cpp --- a/src/cpu/sparc/vm/templateTable_sparc.cpp Thu Oct 16 11:57:39 2014 +0200 +++ b/src/cpu/sparc/vm/templateTable_sparc.cpp Thu Oct 16 12:17:26 2014 +0200 @@ -2942,6 +2942,7 @@ void TemplateTable::generate_vtable_call(Register Rrecv, Register Rindex, Register Rret) { + Register Rtemp = G4_scratch; Register Rcall = Rindex; assert_different_registers(Rcall, G5_method, Gargs, Rret);