-
Notifications
You must be signed in to change notification settings - Fork 24.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add ClassWriter to Painless writing pass (#47140)
This the first part of a series to allow nodes to write all of their appropriate pieces to the class. Currently, nodes must add their bindings, constants, and functions to main SClass node for delayed writing. This instead adds a Painless version of ClassWriter to the write pass. The Painless ClassWriter contains an appropriate ClassVisitor that can be accessed in any node during the process along with access to the clinit method, and finally a shortcut for creating new MethodWriter. The next step will be removing the delayed writing in SClass, and instead, delegate all writing responsibilities to the nodes.
- Loading branch information
Showing
69 changed files
with
820 additions
and
654 deletions.
There are no files selected for viewing
101 changes: 101 additions & 0 deletions
101
modules/lang-painless/src/main/java/org/elasticsearch/painless/ClassWriter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.painless; | ||
|
|
||
| import org.objectweb.asm.ClassVisitor; | ||
| import org.objectweb.asm.Opcodes; | ||
| import org.objectweb.asm.Type; | ||
| import org.objectweb.asm.commons.Method; | ||
| import org.objectweb.asm.util.Printer; | ||
| import org.objectweb.asm.util.TraceClassVisitor; | ||
|
|
||
| import java.io.Closeable; | ||
| import java.util.BitSet; | ||
|
|
||
| /** | ||
| * Manages the top level writers for class and possibly | ||
| * clinit if necessary. | ||
| */ | ||
| public class ClassWriter implements Closeable { | ||
|
|
||
| protected final CompilerSettings compilerSettings; | ||
| protected final BitSet statements; | ||
|
|
||
| protected final org.objectweb.asm.ClassWriter classWriter; | ||
| protected final ClassVisitor classVisitor; | ||
| protected MethodWriter clinitWriter = null; | ||
|
|
||
| public ClassWriter(CompilerSettings compilerSettings, BitSet statements, Printer debugStream, | ||
| Class<?> baseClass, int classFrames, int classAccess, String className, String[] classInterfaces) { | ||
|
|
||
| this.compilerSettings = compilerSettings; | ||
| this.statements = statements; | ||
|
|
||
| classWriter = new org.objectweb.asm.ClassWriter(classFrames); | ||
| ClassVisitor visitor = classWriter; | ||
|
|
||
| if (compilerSettings.isPicky()) { | ||
| visitor = new SimpleChecksAdapter(visitor); | ||
| } | ||
|
|
||
| if (debugStream != null) { | ||
| visitor = new TraceClassVisitor(visitor, debugStream, null); | ||
| } | ||
|
|
||
| classVisitor = visitor; | ||
| classVisitor.visit(WriterConstants.CLASS_VERSION, classAccess, className, null, | ||
| Type.getType(baseClass).getInternalName(), classInterfaces); | ||
| } | ||
|
|
||
| public ClassVisitor getClassVisitor() { | ||
| return classVisitor; | ||
| } | ||
|
|
||
| /** | ||
| * Lazy loads the {@link MethodWriter} for clinit, so that if it's not | ||
| * necessary the method is never created for the class. | ||
| */ | ||
| public MethodWriter getClinitWriter() { | ||
| if (clinitWriter == null) { | ||
| clinitWriter = new MethodWriter(Opcodes.ACC_STATIC, WriterConstants.CLINIT, classVisitor, statements, compilerSettings); | ||
| clinitWriter.visitCode(); | ||
| } | ||
|
|
||
| return clinitWriter; | ||
| } | ||
|
|
||
| public MethodWriter newMethodWriter(int access, Method method) { | ||
| return new MethodWriter(access, method, classVisitor, statements, compilerSettings); | ||
| } | ||
|
|
||
| @Override | ||
| public void close() { | ||
| if (clinitWriter != null) { | ||
| clinitWriter.returnValue(); | ||
| clinitWriter.endMethod(); | ||
| } | ||
|
|
||
| classVisitor.visitEnd(); | ||
| } | ||
|
|
||
| public byte[] getClassBytes() { | ||
| return classWriter.toByteArray(); | ||
| } | ||
| } |
16 changes: 10 additions & 6 deletions
16
modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessLexer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 18 additions & 6 deletions
24
modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParser.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.