blob: d4294d20684d62cc28f6eae8a4feeb77528e76fa (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
From f4d687a4d6ddb08cae3bcce46257ea57544294c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
Date: Thu, 16 Aug 2018 02:27:44 +0100
Subject: [PATCH 1201/1202] hotspot/aarch32: fix missing return values
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Pending
Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
---
src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp | 3 +++
src/cpu/aarch32/vm/relocInfo_aarch32.cpp | 1 +
2 files changed, 4 insertions(+)
diff --git a/hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp b/hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp
index 8aae15af2..76b6f1fe9 100644
--- a/hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp
+++ b/hotspot/src/cpu/aarch32/vm/c1_LIRAssembler_aarch32.cpp
@@ -158,16 +158,19 @@ static Register as_reg(LIR_Opr op) {
Address LIR_Assembler::as_Address(LIR_Address* addr) {
// as_Address(LIR_Address*, Address::InsnDataType) should be used instead
ShouldNotCallThis();
+ return Address();
}
Address LIR_Assembler::as_Address_hi(LIR_Address* addr) {
// as_Address_hi(LIR_Address*, Address::InsnDataType) should be used instead
ShouldNotCallThis();
+ return Address();
}
Address LIR_Assembler::as_Address_lo(LIR_Address* addr) {
// as_Address_lo(LIR_Address*, Address::InsnDataType) should be used instead
ShouldNotCallThis();
+ return Address();
}
Address LIR_Assembler::as_Address(LIR_Address* addr, Register tmp, Address::InsnDataType type) {
diff --git a/hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp b/hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp
index 979d53c98..c0b1a4c7a 100644
--- a/hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp
+++ b/hotspot/src/cpu/aarch32/vm/relocInfo_aarch32.cpp
@@ -87,6 +87,7 @@ address Relocation::pd_call_destination(address orig_addr) {
}
ShouldNotReachHere();
+ return NULL;
}
void Relocation::pd_set_call_destination(address x) {
--
2.26.2
|
