2121
2222
2323import org .elasticsearch .painless .AnalyzerCaster ;
24+ import org .elasticsearch .painless .ClassWriter ;
2425import org .elasticsearch .painless .CompilerSettings ;
2526import org .elasticsearch .painless .DefBootstrap ;
2627import org .elasticsearch .painless .Globals ;
@@ -250,8 +251,8 @@ private void analyzeSimple(Locals locals) {
250251 * also read from.
251252 */
252253 @ Override
253- void write (MethodWriter writer , Globals globals ) {
254- writer .writeDebugInfo (location );
254+ void write (ClassWriter classWriter , MethodWriter methodWriter , Globals globals ) {
255+ methodWriter .writeDebugInfo (location );
255256
256257 // For the case where the assignment represents a String concatenation
257258 // we must, depending on the Java version, write a StringBuilder or
@@ -261,84 +262,87 @@ void write(MethodWriter writer, Globals globals) {
261262 int catElementStackSize = 0 ;
262263
263264 if (cat ) {
264- catElementStackSize = writer .writeNewStrings ();
265+ catElementStackSize = methodWriter .writeNewStrings ();
265266 }
266267
267268 // Cast the lhs to a storeable to perform the necessary operations to store the rhs.
268269 AStoreable lhs = (AStoreable )this .lhs ;
269- lhs .setup (writer , globals ); // call the setup method on the lhs to prepare for a load/store operation
270+ lhs .setup (classWriter , methodWriter , globals ); // call the setup method on the lhs to prepare for a load/store operation
270271
271272 if (cat ) {
272273 // Handle the case where we are doing a compound assignment
273274 // representing a String concatenation.
274275
275- writer .writeDup (lhs .accessElementCount (), catElementStackSize ); // dup the top element and insert it
276+ methodWriter .writeDup (lhs .accessElementCount (), catElementStackSize ); // dup the top element and insert it
276277 // before concat helper on stack
277- lhs .load (writer , globals ); // read the current lhs's value
278- writer .writeAppendStrings (lhs .actual ); // append the lhs's value using the StringBuilder
278+ lhs .load (classWriter , methodWriter , globals ); // read the current lhs's value
279+ methodWriter .writeAppendStrings (lhs .actual ); // append the lhs's value using the StringBuilder
279280
280- rhs .write (writer , globals ); // write the bytecode for the rhs
281+ rhs .write (classWriter , methodWriter , globals ); // write the bytecode for the rhs
281282
282283 if (!(rhs instanceof EBinary ) || !((EBinary )rhs ).cat ) { // check to see if the rhs has already done a concatenation
283- writer .writeAppendStrings (rhs .actual ); // append the rhs's value since it's hasn't already
284+ methodWriter .writeAppendStrings (rhs .actual ); // append the rhs's value since it's hasn't already
284285 }
285286
286- writer .writeToStrings (); // put the value for string concat onto the stack
287- writer .writeCast (back ); // if necessary, cast the String to the lhs actual type
287+ methodWriter .writeToStrings (); // put the value for string concat onto the stack
288+ methodWriter .writeCast (back ); // if necessary, cast the String to the lhs actual type
288289
289290 if (lhs .read ) {
290- writer .writeDup (MethodWriter .getType (lhs .actual ).getSize (), lhs .accessElementCount ()); // if this lhs is also read
291+ methodWriter .writeDup (MethodWriter .getType (lhs .actual ).getSize (), lhs .accessElementCount ()); // if this lhs is also read
291292 // from dup the value onto the stack
292293 }
293294
294- lhs .store (writer , globals ); // store the lhs's value from the stack in its respective variable/field/array
295+ lhs .store (classWriter , methodWriter , globals ); // store the lhs's value from the stack in its respective variable/field/array
295296 } else if (operation != null ) {
296297 // Handle the case where we are doing a compound assignment that
297298 // does not represent a String concatenation.
298299
299- writer .writeDup (lhs .accessElementCount (), 0 ); // if necessary, dup the previous lhs's value
300- // to be both loaded from and stored to
301- lhs .load (writer , globals ); // load the current lhs's value
300+ methodWriter .writeDup (lhs .accessElementCount (), 0 ); // if necessary, dup the previous lhs's value
301+ // to be both loaded from and stored to
302+ lhs .load (classWriter , methodWriter , globals ); // load the current lhs's value
302303
303304 if (lhs .read && post ) {
304- writer .writeDup (MethodWriter .getType (lhs .actual ).getSize (), lhs .accessElementCount ()); // dup the value if the lhs is also
305- // read from and is a post increment
305+ methodWriter .writeDup (MethodWriter .getType (lhs .actual ).getSize (), lhs .accessElementCount ()); // dup the value if the
306+ // lhs is also
307+ // read from and is a post
308+ // increment
306309 }
307310
308- writer .writeCast (there ); // if necessary cast the current lhs's value
309- // to the promotion type between the lhs and rhs types
310- rhs .write (writer , globals ); // write the bytecode for the rhs
311+ methodWriter .writeCast (there ); // if necessary cast the current lhs's value
312+ // to the promotion type between the lhs and rhs types
313+ rhs .write (classWriter , methodWriter , globals ); // write the bytecode for the rhs
311314
312315 // XXX: fix these types, but first we need def compound assignment tests.
313316 // its tricky here as there are possibly explicit casts, too.
314317 // write the operation instruction for compound assignment
315318 if (promote == def .class ) {
316- writer .writeDynamicBinaryInstruction (
319+ methodWriter .writeDynamicBinaryInstruction (
317320 location , promote , def .class , def .class , operation , DefBootstrap .OPERATOR_COMPOUND_ASSIGNMENT );
318321 } else {
319- writer .writeBinaryInstruction (location , promote , operation );
322+ methodWriter .writeBinaryInstruction (location , promote , operation );
320323 }
321324
322- writer .writeCast (back ); // if necessary cast the promotion type value back to the lhs's type
325+ methodWriter .writeCast (back ); // if necessary cast the promotion type value back to the lhs's type
323326
324327 if (lhs .read && !post ) {
325- writer .writeDup (MethodWriter .getType (lhs .actual ).getSize (), lhs .accessElementCount ()); // dup the value if the lhs is also
326- // read from and is not a post
327- // increment
328+ methodWriter .writeDup (MethodWriter .getType (lhs .actual ).getSize (), lhs .accessElementCount ()); // dup the value if the lhs
329+ // is also
330+ // read from and is not a post
331+ // increment
328332 }
329333
330- lhs .store (writer , globals ); // store the lhs's value from the stack in its respective variable/field/array
334+ lhs .store (classWriter , methodWriter , globals ); // store the lhs's value from the stack in its respective variable/field/array
331335 } else {
332336 // Handle the case for a simple write.
333337
334- rhs .write (writer , globals ); // write the bytecode for the rhs rhs
338+ rhs .write (classWriter , methodWriter , globals ); // write the bytecode for the rhs rhs
335339
336340 if (lhs .read ) {
337- writer .writeDup (MethodWriter .getType (lhs .actual ).getSize (), lhs .accessElementCount ()); // dup the value if the lhs
341+ methodWriter .writeDup (MethodWriter .getType (lhs .actual ).getSize (), lhs .accessElementCount ()); // dup the value if the lhs
338342 // is also read from
339343 }
340344
341- lhs .store (writer , globals ); // store the lhs's value from the stack in its respective variable/field/array
345+ lhs .store (classWriter , methodWriter , globals ); // store the lhs's value from the stack in its respective variable/field/array
342346 }
343347 }
344348
0 commit comments