From 2316ddb90aafd41dfeaa41a63b49ab322931b260 Mon Sep 17 00:00:00 2001
From: Dmitri Makarov <dmakarov@users.noreply.github.com>
Date: Fri, 28 May 2021 11:36:46 +0200
Subject: [PATCH] Revert bpf-tools to version 1.8 because of a codegen bug
 suspicion (#17568)

---
 programs/bpf/tests/programs.rs  | 26 +++++++++++++-------------
 sdk/bpf/c/bpf.mk                |  2 +-
 sdk/bpf/scripts/install.sh      |  2 +-
 sdk/cargo-build-bpf/src/main.rs |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/programs/bpf/tests/programs.rs b/programs/bpf/tests/programs.rs
index b95e4d7fc..8b0710c0f 100644
--- a/programs/bpf/tests/programs.rs
+++ b/programs/bpf/tests/programs.rs
@@ -1252,11 +1252,11 @@ fn assert_instruction_count() {
             ("alloc", 1137),
             ("bpf_to_bpf", 13),
             ("multiple_static", 8),
-            ("noop", 5),
-            ("noop++", 5),
+            ("noop", 42),
+            ("noop++", 42),
             ("relative_call", 10),
-            ("sanity", 169),
-            ("sanity++", 168),
+            ("sanity", 174),
+            ("sanity++", 174),
             ("sha", 694),
             ("struct_pass", 8),
             ("struct_ret", 22),
@@ -1266,17 +1266,17 @@ fn assert_instruction_count() {
     {
         programs.extend_from_slice(&[
             ("solana_bpf_rust_128bit", 584),
-            ("solana_bpf_rust_alloc", 4967),
-            ("solana_bpf_rust_custom_heap", 365),
+            ("solana_bpf_rust_alloc", 5072),
+            ("solana_bpf_rust_custom_heap", 367),
             ("solana_bpf_rust_dep_crate", 2),
-            ("solana_bpf_rust_external_spend", 334),
-            ("solana_bpf_rust_iter", 8),
-            ("solana_bpf_rust_many_args", 189),
-            ("solana_bpf_rust_mem", 1665),
-            ("solana_bpf_rust_noop", 322),
+            ("solana_bpf_rust_external_spend", 336),
+            ("solana_bpf_rust_iter", 279),
+            ("solana_bpf_rust_many_args", 191),
+            ("solana_bpf_rust_mem", 1670),
+            ("solana_bpf_rust_noop", 324),
             ("solana_bpf_rust_param_passing", 46),
-            ("solana_bpf_rust_rand", 325),
-            ("solana_bpf_rust_sanity", 587),
+            ("solana_bpf_rust_rand", 327),
+            ("solana_bpf_rust_sanity", 595),
             ("solana_bpf_rust_sha", 22417),
         ]);
     }
diff --git a/sdk/bpf/c/bpf.mk b/sdk/bpf/c/bpf.mk
index 076cd5e6c..a926fdfea 100644
--- a/sdk/bpf/c/bpf.mk
+++ b/sdk/bpf/c/bpf.mk
@@ -15,7 +15,7 @@ OUT_DIR ?= ./out
 OS := $(shell uname)
 
 LLVM_DIR = $(LOCAL_PATH)../dependencies/bpf-tools/llvm
-LLVM_SYSTEM_INC_DIRS := $(LLVM_DIR)/lib/clang/12.0.1/include
+LLVM_SYSTEM_INC_DIRS := $(LLVM_DIR)/lib/clang/11.0.1/include
 COMPILER_RT_DIR = $(LOCAL_PATH)../dependencies/bpf-tools/rust/lib/rustlib/bpfel-unknown-unknown/lib
 
 ifdef LLVM_DIR
diff --git a/sdk/bpf/scripts/install.sh b/sdk/bpf/scripts/install.sh
index 7bbabff3b..2da6710be 100755
--- a/sdk/bpf/scripts/install.sh
+++ b/sdk/bpf/scripts/install.sh
@@ -92,7 +92,7 @@ if [[ ! -e criterion-$version.md || ! -e criterion ]]; then
 fi
 
 # Install Rust-BPF
-version=v1.9
+version=v1.8
 if [[ ! -e bpf-tools-$version.md || ! -e bpf-tools ]]; then
   (
     set -e
diff --git a/sdk/cargo-build-bpf/src/main.rs b/sdk/cargo-build-bpf/src/main.rs
index ba0bf06d9..9ad8c00f7 100644
--- a/sdk/cargo-build-bpf/src/main.rs
+++ b/sdk/cargo-build-bpf/src/main.rs
@@ -360,7 +360,7 @@ fn build_bpf_package(config: &Config, target_directory: &Path, package: &cargo_m
     install_if_missing(
         &config,
         "bpf-tools",
-        "v1.9",
+        "v1.8",
         "https://github.com/solana-labs/bpf-tools/releases/download",
         &PathBuf::from(bpf_tools_filename),
     )