Bump platform tools version (#35330)
Co-authored-by: Dmitri Makarov <dmakarov@users.noreply.github.com>
This commit is contained in:
parent
8ad125d0c0
commit
8be9930c98
|
@ -16,6 +16,21 @@ struct SStruct {
|
||||||
z: u64,
|
z: u64,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(dead_code)]
|
||||||
|
#[repr(C)]
|
||||||
|
enum TestEnum {
|
||||||
|
VariantOne,
|
||||||
|
VariantTwo,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[allow(dead_code)]
|
||||||
|
#[allow(clippy::enum_clike_unportable_variant)]
|
||||||
|
#[repr(C)]
|
||||||
|
enum Test64BitEnum {
|
||||||
|
VariantOne,
|
||||||
|
VariantTwo = 0xFFFFFFFFF,
|
||||||
|
}
|
||||||
|
|
||||||
#[inline(never)]
|
#[inline(never)]
|
||||||
fn return_sstruct() -> SStruct {
|
fn return_sstruct() -> SStruct {
|
||||||
SStruct { x: 1, y: 2, z: 3 }
|
SStruct { x: 1, y: 2, z: 3 }
|
||||||
|
@ -72,6 +87,14 @@ pub fn process_instruction(
|
||||||
assert!(1.9986f64 < num && num < 2.0f64);
|
assert!(1.9986f64 < num && num < 2.0f64);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
// #[repr(C) enums must not change size between compiler version
|
||||||
|
// 32-bit for #[repr(C)] enum
|
||||||
|
assert_eq!(std::mem::size_of::<TestEnum>(), 4);
|
||||||
|
// 64-bit for enum with a declared value
|
||||||
|
assert_eq!(std::mem::size_of::<Test64BitEnum>(), 8);
|
||||||
|
}
|
||||||
|
|
||||||
check_type_assumptions();
|
check_type_assumptions();
|
||||||
|
|
||||||
sol_log_compute_units();
|
sol_log_compute_units();
|
||||||
|
|
|
@ -1356,7 +1356,7 @@ fn assert_instruction_count() {
|
||||||
#[cfg(feature = "sbf_c")]
|
#[cfg(feature = "sbf_c")]
|
||||||
{
|
{
|
||||||
programs.extend_from_slice(&[
|
programs.extend_from_slice(&[
|
||||||
("alloc", 11502),
|
("alloc", 14575),
|
||||||
("sbf_to_sbf", 313),
|
("sbf_to_sbf", 313),
|
||||||
("multiple_static", 208),
|
("multiple_static", 208),
|
||||||
("noop", 5),
|
("noop", 5),
|
||||||
|
|
|
@ -109,16 +109,16 @@ if [[ ! -e criterion-$version.md || ! -e criterion ]]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Install Rust-BPF
|
# Install Rust-BPF
|
||||||
version=v1.39
|
version=v1.41
|
||||||
if [[ ! -e bpf-tools-$version.md || ! -e bpf-tools ]]; then
|
if [[ ! -e bpf-tools-$version.md || ! -e bpf-tools ]]; then
|
||||||
(
|
(
|
||||||
set -e
|
set -e
|
||||||
rm -rf bpf-tools*
|
rm -rf bpf-tools*
|
||||||
rm -rf xargo
|
rm -rf xargo
|
||||||
job="download \
|
job="download \
|
||||||
https://github.com/solana-labs/bpf-tools/releases/download \
|
https://github.com/anza-xyz/platform-tools/releases/download \
|
||||||
$version \
|
$version \
|
||||||
solana-bpf-tools-${machine}-${arch}.tar.bz2 \
|
platform-tools-${machine}-${arch}.tar.bz2 \
|
||||||
bpf-tools"
|
bpf-tools"
|
||||||
get $version bpf-tools "$job"
|
get $version bpf-tools "$job"
|
||||||
)
|
)
|
||||||
|
|
|
@ -913,7 +913,7 @@ fn main() {
|
||||||
|
|
||||||
// The following line is scanned by CI configuration script to
|
// The following line is scanned by CI configuration script to
|
||||||
// separate cargo caches according to the version of platform-tools.
|
// separate cargo caches according to the version of platform-tools.
|
||||||
let platform_tools_version = String::from("v1.39");
|
let platform_tools_version = String::from("v1.41");
|
||||||
let rust_base_version = get_base_rust_version(platform_tools_version.as_str());
|
let rust_base_version = get_base_rust_version(platform_tools_version.as_str());
|
||||||
let version = format!(
|
let version = format!(
|
||||||
"{}\nplatform-tools {}\n{}",
|
"{}\nplatform-tools {}\n{}",
|
||||||
|
|
|
@ -9,7 +9,7 @@ repository = { workspace = true }
|
||||||
homepage = { workspace = true }
|
homepage = { workspace = true }
|
||||||
license = { workspace = true }
|
license = { workspace = true }
|
||||||
edition = { workspace = true }
|
edition = { workspace = true }
|
||||||
rust-version = "1.72.0" # solana platform-tools rust version
|
rust-version = "1.75.0" # solana platform-tools rust version
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
bincode = { workspace = true }
|
bincode = { workspace = true }
|
||||||
|
|
|
@ -15,7 +15,7 @@ OUT_DIR ?= ./out
|
||||||
OS := $(shell uname)
|
OS := $(shell uname)
|
||||||
|
|
||||||
LLVM_DIR = $(LOCAL_PATH)../dependencies/platform-tools/llvm
|
LLVM_DIR = $(LOCAL_PATH)../dependencies/platform-tools/llvm
|
||||||
LLVM_SYSTEM_INC_DIRS := $(LLVM_DIR)/lib/clang/15.0.4/include
|
LLVM_SYSTEM_INC_DIRS := $(LLVM_DIR)/lib/clang/17/include
|
||||||
COMPILER_RT_DIR = $(LOCAL_PATH)../dependencies/platform-tools/rust/lib/rustlib/sbf-solana-solana/lib
|
COMPILER_RT_DIR = $(LOCAL_PATH)../dependencies/platform-tools/rust/lib/rustlib/sbf-solana-solana/lib
|
||||||
STD_INC_DIRS := $(LLVM_DIR)/include
|
STD_INC_DIRS := $(LLVM_DIR)/include
|
||||||
STD_LIB_DIRS := $(LLVM_DIR)/lib
|
STD_LIB_DIRS := $(LLVM_DIR)/lib
|
||||||
|
|
|
@ -109,13 +109,13 @@ if [[ ! -e criterion-$version.md || ! -e criterion ]]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Install platform tools
|
# Install platform tools
|
||||||
version=v1.39
|
version=v1.41
|
||||||
if [[ ! -e platform-tools-$version.md || ! -e platform-tools ]]; then
|
if [[ ! -e platform-tools-$version.md || ! -e platform-tools ]]; then
|
||||||
(
|
(
|
||||||
set -e
|
set -e
|
||||||
rm -rf platform-tools*
|
rm -rf platform-tools*
|
||||||
job="download \
|
job="download \
|
||||||
https://github.com/solana-labs/platform-tools/releases/download \
|
https://github.com/anza-xyz/platform-tools/releases/download \
|
||||||
$version \
|
$version \
|
||||||
platform-tools-${machine}-${arch}.tar.bz2 \
|
platform-tools-${machine}-${arch}.tar.bz2 \
|
||||||
platform-tools"
|
platform-tools"
|
||||||
|
|
Loading…
Reference in New Issue