Skip to content

deps: V8: cherry-pick 7ef6a001762 fix LoongArch64 architecture build failed #60259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −20
Open

deps: V8: cherry-pick 7ef6a001762 fix LoongArch64 architecture build failed #60259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

# Reset this number to 0 on major V8 upgrades.
# Increment by one for each non-official patch applied to deps/v8.
'v8_embedder_string': '-node.10',
'v8_embedder_string': '-node.11',

##### V8 defaults for Node.js #####

Expand Down
2 changes: 1 addition & 1 deletion deps/v8/src/builtins/loong64/builtins-loong64.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ static void GetSharedFunctionInfoBytecodeOrBaseline(
if (v8_flags.debug_code) {
Label not_baseline;
__ GetObjectType(data, scratch1, scratch1);
__ Branch(&not_baseline, ne, scratch1, Operand(CODETYPE));
__ Branch(&not_baseline, ne, scratch1, Operand(CODE_TYPE));
AssertCodeIsBaseline(masm, data, scratch1);
__ Branch(is_baseline);
__ bind(&not_baseline);
Expand Down
35 changes: 18 additions & 17 deletions deps/v8/src/codegen/loong64/macro-assembler-loong64.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2618,12 +2618,12 @@ int32_t MacroAssembler::GetOffset(Label* L, OffsetSize bits) {
}

Register MacroAssembler::GetRkAsRegisterHelper(const Operand& rk,
Register scratch) {
UseScratchRegisterScope temps) {
Register r2 = no_reg;
if (rk.is_reg()) {
r2 = rk.rm();
} else {
r2 = scratch;
r2 = temps.Acquire();
li(r2, rk);
}

Expand All @@ -2635,7 +2635,6 @@ bool MacroAssembler::BranchShortOrFallback(Label* L, Condition cond,
bool need_link) {
UseScratchRegisterScope temps(this);
BlockTrampolinePoolScope block_trampoline_pool(this);
Register scratch = temps.Acquire();
DCHECK_NE(rj, zero_reg);

// Be careful to always use shifted_branch_offset only just before the
Expand Down Expand Up @@ -2671,7 +2670,7 @@ bool MacroAssembler::BranchShortOrFallback(Label* L, Condition cond,
if (L->is_bound() && !is_near(L, OffsetSize::kOffset16)) return false;
if (need_link) pcaddi(ra, 2);
// We don't want any other register but scratch clobbered.
Register sc = GetRkAsRegisterHelper(rk, scratch);
Register sc = GetRkAsRegisterHelper(rk, temps);
offset = GetOffset(L, OffsetSize::kOffset16);
beq(rj, sc, offset);
}
Expand All @@ -2693,7 +2692,7 @@ bool MacroAssembler::BranchShortOrFallback(Label* L, Condition cond,
if (L->is_bound() && !is_near(L, OffsetSize::kOffset16)) return false;
if (need_link) pcaddi(ra, 2);
// We don't want any other register but scratch clobbered.
Register sc = GetRkAsRegisterHelper(rk, scratch);
Register sc = GetRkAsRegisterHelper(rk, temps);
offset = GetOffset(L, OffsetSize::kOffset16);
bne(rj, sc, offset);
}
Expand All @@ -2712,7 +2711,7 @@ bool MacroAssembler::BranchShortOrFallback(Label* L, Condition cond,
} else {
if (L->is_bound() && !is_near(L, OffsetSize::kOffset16)) return false;
if (need_link) pcaddi(ra, 2);
Register sc = GetRkAsRegisterHelper(rk, scratch);
Register sc = GetRkAsRegisterHelper(rk, temps);
DCHECK(rj != sc);
offset = GetOffset(L, OffsetSize::kOffset16);
blt(sc, rj, offset);
Expand All @@ -2733,7 +2732,7 @@ bool MacroAssembler::BranchShortOrFallback(Label* L, Condition cond,
} else {
if (L->is_bound() && !is_near(L, OffsetSize::kOffset16)) return false;
if (need_link) pcaddi(ra, 2);
Register sc = GetRkAsRegisterHelper(rk, scratch);
Register sc = GetRkAsRegisterHelper(rk, temps);
DCHECK(rj != sc);
offset = GetOffset(L, OffsetSize::kOffset16);
bge(rj, sc, offset);
Expand All @@ -2751,7 +2750,7 @@ bool MacroAssembler::BranchShortOrFallback(Label* L, Condition cond,
} else {
if (L->is_bound() && !is_near(L, OffsetSize::kOffset16)) return false;
if (need_link) pcaddi(ra, 2);
Register sc = GetRkAsRegisterHelper(rk, scratch);
Register sc = GetRkAsRegisterHelper(rk, temps);
DCHECK(rj != sc);
offset = GetOffset(L, OffsetSize::kOffset16);
blt(rj, sc, offset);
Expand All @@ -2772,7 +2771,7 @@ bool MacroAssembler::BranchShortOrFallback(Label* L, Condition cond,
} else {
if (L->is_bound() && !is_near(L, OffsetSize::kOffset16)) return false;
if (need_link) pcaddi(ra, 2);
Register sc = GetRkAsRegisterHelper(rk, scratch);
Register sc = GetRkAsRegisterHelper(rk, temps);
DCHECK(rj != sc);
offset = GetOffset(L, OffsetSize::kOffset16);
bge(sc, rj, offset);
Expand All @@ -2792,7 +2791,7 @@ bool MacroAssembler::BranchShortOrFallback(Label* L, Condition cond,
} else {
if (L->is_bound() && !is_near(L, OffsetSize::kOffset16)) return false;
if (need_link) pcaddi(ra, 2);
Register sc = GetRkAsRegisterHelper(rk, scratch);
Register sc = GetRkAsRegisterHelper(rk, temps);
DCHECK(rj != sc);
offset = GetOffset(L, OffsetSize::kOffset16);
bltu(sc, rj, offset);
Expand All @@ -2813,7 +2812,7 @@ bool MacroAssembler::BranchShortOrFallback(Label* L, Condition cond,
} else {
if (L->is_bound() && !is_near(L, OffsetSize::kOffset16)) return false;
if (need_link) pcaddi(ra, 2);
Register sc = GetRkAsRegisterHelper(rk, scratch);
Register sc = GetRkAsRegisterHelper(rk, temps);
DCHECK(rj != sc);
offset = GetOffset(L, OffsetSize::kOffset16);
bgeu(rj, sc, offset);
Expand All @@ -2828,7 +2827,7 @@ bool MacroAssembler::BranchShortOrFallback(Label* L, Condition cond,
} else {
if (L->is_bound() && !is_near(L, OffsetSize::kOffset16)) return false;
if (need_link) pcaddi(ra, 2);
Register sc = GetRkAsRegisterHelper(rk, scratch);
Register sc = GetRkAsRegisterHelper(rk, temps);
DCHECK(rj != sc);
offset = GetOffset(L, OffsetSize::kOffset16);
bltu(rj, sc, offset);
Expand All @@ -2848,7 +2847,7 @@ bool MacroAssembler::BranchShortOrFallback(Label* L, Condition cond,
} else {
if (L->is_bound() && !is_near(L, OffsetSize::kOffset16)) return false;
if (need_link) pcaddi(ra, 2);
Register sc = GetRkAsRegisterHelper(rk, scratch);
Register sc = GetRkAsRegisterHelper(rk, temps);
DCHECK(rj != sc);
offset = GetOffset(L, OffsetSize::kOffset16);
bgeu(sc, rj, offset);
Expand Down Expand Up @@ -3079,10 +3078,12 @@ void MacroAssembler::CompareTaggedRootAndBranch(const Register& obj,
// Some smi roots contain system pointer size values like stack limits.
DCHECK(base::IsInRange(index, RootIndex::kFirstStrongOrReadOnlyRoot,
RootIndex::kLastStrongOrReadOnlyRoot));
Register temp = temps.Acquire();
DCHECK(!AreAliased(obj, temp));
LoadRoot(temp, index);
CompareTaggedAndBranch(target, cc, obj, Operand(temp));
Register scratch1 = temps.Acquire();
Register scratch2 = temps.Acquire();
DCHECK(!AreAliased(obj, scratch1, scratch2));
slli_w(scratch1, obj, 0);
LoadTaggedRoot(scratch2, index);
Branch(target, cc, scratch1, Operand(scratch2));
}

// Compare the object in a register to a value from the root list.
Expand Down
3 changes: 2 additions & 1 deletion deps/v8/src/codegen/loong64/macro-assembler-loong64.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1286,7 +1286,8 @@ class V8_EXPORT_PRIVATE MacroAssembler : public MacroAssemblerBase {
}

protected:
inline Register GetRkAsRegisterHelper(const Operand& rk, Register scratch);
inline Register GetRkAsRegisterHelper(const Operand& rk,
UseScratchRegisterScope temps);
inline int32_t GetOffset(Label* L, OffsetSize bits);

private:
Expand Down
Loading