Mercurial > hg > truffle
changeset 7840:c052cfe3cae3
let CodeUtil.getCallingConvention() honour receivers (if any)
author | Michael Haupt <michael.haupt@oracle.com> |
---|---|
date | Mon, 25 Feb 2013 10:49:47 +0100 |
parents | 838293a77af7 |
children | 674a8b9e62f8 a4a8909a6096 |
files | graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CodeUtil.java |
diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CodeUtil.java Fri Feb 22 12:15:14 2013 +0100 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CodeUtil.java Mon Feb 25 10:49:47 2013 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,7 @@ */ package com.oracle.graal.api.code; +import java.lang.reflect.*; import java.util.*; import com.oracle.graal.api.meta.*; @@ -317,7 +318,7 @@ public static CallingConvention getCallingConvention(CodeCacheProvider codeCache, CallingConvention.Type type, ResolvedJavaMethod method, boolean stackOnly) { Signature sig = method.getSignature(); JavaType retType = sig.getReturnType(null); - JavaType[] argTypes = new JavaType[sig.getParameterCount(false)]; + JavaType[] argTypes = new JavaType[sig.getParameterCount(!Modifier.isStatic(method.getModifiers()))]; for (int i = 0; i < argTypes.length; i++) { argTypes[i] = sig.getParameterType(i, null); }