diff options
| author | Christian Bruel <christian.bruel@st.com> | 2015-10-26 10:50:37 +0100 |
|---|---|---|
| committer | Christian Bruel <chrbr@gcc.gnu.org> | 2015-10-26 10:50:37 +0100 |
| commit | c1fffdf1fb2ebce24620195c4add32eb90daa598 (patch) | |
| tree | 90a790213de81ca57c7114076a08cb59d61c9df3 /gcc/java | |
| parent | 5929c659186adc165b6cc32aab2890a1629d667a (diff) | |
| download | gcc-c1fffdf1fb2ebce24620195c4add32eb90daa598.zip gcc-c1fffdf1fb2ebce24620195c4add32eb90daa598.tar.gz gcc-c1fffdf1fb2ebce24620195c4add32eb90daa598.tar.bz2 | |
function.h (MINIMUM_METHOD_BOUNDARY): New macro.
2015-10-26 Christian Bruel <christian.bruel@st.com>
* function.h (MINIMUM_METHOD_BOUNDARY): New macro.
* cp/decl.c (grokfndecl): Set DECL_ALIGN with MINIMUM_METHOD_BOUNDARY.
* cp/method.c (implicitly_declare_fn): Likewise.
* cp/lambda.c (maybe_add_lambda_conv_op): Likewise. Remove VBIT setting.
* java/class.c (add_method_1): Likewise.
From-SVN: r229313
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/class.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/gcc/java/class.c b/gcc/java/class.c index 9e6b45c..8f1288f 100644 --- a/gcc/java/class.c +++ b/gcc/java/class.c @@ -779,13 +779,8 @@ add_method_1 (tree this_class, int access_flags, tree name, tree function_type) DECL_CHAIN (fndecl) = TYPE_METHODS (this_class); TYPE_METHODS (this_class) = fndecl; - /* If pointers to member functions use the least significant bit to - indicate whether a function is virtual, ensure a pointer - to this function will have that bit clear. */ - if (TARGET_PTRMEMFUNC_VBIT_LOCATION == ptrmemfunc_vbit_in_pfn - && !(access_flags & ACC_STATIC) - && DECL_ALIGN (fndecl) < 2 * BITS_PER_UNIT) - DECL_ALIGN (fndecl) = 2 * BITS_PER_UNIT; + if (!(access_flags & ACC_STATIC)) + DECL_ALIGN (fndecl) = MINIMUM_METHOD_BOUNDARY; /* Notice that this is a finalizer and update the class type accordingly. This is used to optimize instance allocation. */ |