Remove feature core_intrinsics

Reviewed By: bobyangyf

Differential Revision: D41015779

fbshipit-source-id: 66a8171554e970a0e2f82ca4f57eac69730fcc46

Author: stepancheg

starlark/src/collections/alloca.rs

@@ -20,13 +20,14 @@ use std::alloc::dealloc;
 use std::alloc::Layout;
 use std::cell::Cell;
 use std::cell::RefCell;
-use std::intrinsics::likely;
-use std::intrinsics::unlikely;
 use std::mem;
 use std::mem::MaybeUninit;
 use std::ptr;
 use std::slice;
 
+use crate::hint::likely;
+use crate::hint::unlikely;
+
 /// We'd love to use the real `alloca`, but don't want to blow through the stack space,
 /// so define our own wrapper.
 /// We use a single continuous buffer. When it needs upgrading, we double it and keep the old one around.

starlark/src/eval/mod.rs

@@ -22,7 +22,6 @@ pub(crate) mod bc;
 pub(crate) mod compiler;
 pub(crate) mod runtime;
 
-use std::intrinsics::unlikely;
 use std::mem;
 use std::time::Instant;
 
@@ -48,6 +47,7 @@ use crate::eval::compiler::scope::ScopeId;
 use crate::eval::compiler::Compiler;
 use crate::eval::runtime::arguments::ArgNames;
 use crate::eval::runtime::arguments::ArgumentsFull;
+use crate::hint::unlikely;
 use crate::syntax::ast::AstModule;
 use crate::syntax::DialectTypes;
 use crate::values::docs::DocString;

starlark/src/eval/runtime/arguments.rs

@@ -15,7 +15,6 @@
  * limitations under the License.
  */
 
-use std::intrinsics::unlikely;
 use std::iter;
 use std::marker::PhantomData;
 
@@ -30,6 +29,7 @@ use crate::collections::Hashed;
 use crate::collections::SmallMap;
 use crate::collections::StarlarkHashValue;
 use crate::eval::runtime::params::ParametersSpec;
+use crate::hint::unlikely;
 use crate::values::dict::Dict;
 use crate::values::dict::DictRef;
 use crate::values::type_repr::StarlarkTypeRepr;

starlark/src/eval/runtime/call_stack.rs

@@ -27,7 +27,6 @@
 use std::fmt;
 use std::fmt::Debug;
 use std::fmt::Display;
-use std::intrinsics::unlikely;
 
 use gazebo::prelude::*;
 use once_cell::sync::Lazy;
@@ -37,6 +36,7 @@ use crate::codemap::FileSpan;
 use crate::codemap::Span;
 use crate::errors::Frame;
 use crate::eval::runtime::inlined_frame::InlinedFrames;
+use crate::hint::unlikely;
 use crate::values::FrozenRef;
 use crate::values::Trace;
 use crate::values::Tracer;

starlark/src/eval/runtime/params.rs

@@ -20,7 +20,6 @@
 use std::cell::Cell;
 use std::cmp;
 use std::collections::HashMap;
-use std::intrinsics::unlikely;
 
 use gazebo::coerce::coerce;
 use gazebo::coerce::Coerce;
@@ -36,6 +35,7 @@ use crate::eval::runtime::arguments::FunctionError;
 use crate::eval::runtime::arguments::ResolvedArgName;
 use crate::eval::Arguments;
 use crate::eval::Evaluator;
+use crate::hint::unlikely;
 use crate::values::dict::Dict;
 use crate::values::docs;
 use crate::values::docs::DocString;

starlark/src/hint.rs

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2018 The Starlark in Rust Authors.
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// TODO(nga): also enable if cargo build and nightly.
+#[cfg(fbcode_build)]
+pub(crate) use std::intrinsics::likely;
+#[cfg(fbcode_build)]
+pub(crate) use std::intrinsics::unlikely;
+
+#[cfg(not(fbcode_build))]
+#[inline]
+pub(crate) fn likely(b: bool) -> bool {
+    b
+}
+
+#[cfg(not(fbcode_build))]
+#[inline]
+pub(crate) fn unlikely(b: bool) -> bool {
+    b
+}

starlark/src/lib.rs

@@ -352,7 +352,7 @@
 #![feature(box_syntax)]
 #![feature(const_mut_refs)]
 #![feature(const_type_id)]
-#![feature(core_intrinsics)]
+#![cfg_attr(fbcode_build, feature(core_intrinsics))]
 #![feature(generic_associated_types)]
 #![feature(maybe_uninit_slice)]
 #![feature(maybe_uninit_write_slice)]
@@ -411,6 +411,7 @@ mod private;
 pub mod read_line;
 mod sealed;
 
+mod hint;
 mod stdlib;
 pub mod syntax;
 pub mod values;

starlark/src/stdlib/dict.rs

@@ -17,11 +17,11 @@
 
 //! Methods for the `dict` type.
 
-use std::intrinsics::unlikely;
 use std::mem;
 
 use crate as starlark;
 use crate::environment::MethodsBuilder;
+use crate::hint::unlikely;
 use crate::values::dict::Dict;
 use crate::values::dict::DictRef;
 use crate::values::none::NoneType;

starlark/src/values/recursive_repr_or_json_guard.rs

@@ -18,9 +18,9 @@
 //! Detect recursion when doing `repr` or `to_json`.
 
 use std::cell::Cell;
-use std::intrinsics::unlikely;
 
 use crate::collections::SmallSet;
+use crate::hint::unlikely;
 use crate::values::layout::pointer::RawPointer;
 use crate::values::Value;
 

starlark/src/values/stack_guard.rs

@@ -18,8 +18,8 @@
 //! Guard to check we don't recurse too deeply with nested operations like Equals.
 
 use std::cell::Cell;
-use std::intrinsics::unlikely;
 
+use crate::hint::unlikely;
 use crate::values::error::ControlError;
 
 // Maximum recursion level for comparison