Mercurial > hg > graal-jvmci-8
comparison graal/com.oracle.truffle.sl/src/com/oracle/truffle/sl/nodes/FunctionCallNode.java @ 13804:3840d61e0e68
Merge.
| author | Christian Humer <christian.humer@gmail.com> |
|---|---|
| date | Tue, 28 Jan 2014 12:52:57 +0100 |
| parents | e076c87ab175 |
| children |
comparison
equal
deleted
inserted
replaced
| 13803:e076c87ab175 | 13804:3840d61e0e68 |
|---|---|
| 103 this.callNode = adoptChild(CallNode.create(cachedFunction)); | 103 this.callNode = adoptChild(CallNode.create(cachedFunction)); |
| 104 this.nextNode = adoptChild(next); | 104 this.nextNode = adoptChild(next); |
| 105 | 105 |
| 106 // inline usually known functions that should always be inlined | 106 // inline usually known functions that should always be inlined |
| 107 if (findSLFunctionRoot(cachedFunction).isInlineImmediatly()) { | 107 if (findSLFunctionRoot(cachedFunction).isInlineImmediatly()) { |
| 108 if (callNode.isInlinable() && !callNode.isInlined()) { | 108 callNode.inline(); |
| 109 callNode.inline(); | |
| 110 } | |
| 111 } | 109 } |
| 112 } | 110 } |
| 113 | 111 |
| 114 @Override | 112 @Override |
| 115 public Object executeCall(VirtualFrame frame, CallTarget function, SLArguments arguments) { | 113 public Object executeCall(VirtualFrame frame, CallTarget function, SLArguments arguments) { |