diff options
| author | chrbr <chrbr@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-10-26 09:50:37 +0000 |
|---|---|---|
| committer | chrbr <chrbr@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-10-26 09:50:37 +0000 |
| commit | dda08454a53e6627ab64ea06f8bb80cb9a949986 (patch) | |
| tree | 90a790213de81ca57c7114076a08cb59d61c9df3 /gcc/java | |
| parent | 3bf3305960593bd04b7ad2e0c473022d6dfef291 (diff) | |
| download | gcc-dda08454a53e6627ab64ea06f8bb80cb9a949986.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@229313 138bc75d-0d04-0410-961f-82ee72b054a4
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 9e6b45c4467..8f1288f8584 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. */ |