Replace NAN_INLINE with 'inline' keyword. (#577)

* Replace NAN_INLINE with 'inline' keyword. There is no reason to mark everything `__attribute__((always_inline))`, just use the regular keyword and let the compiler decide. Avoids code bloat and build errors when inlining fails due to compiler limitations. Fixes: #576 * fixup! retain NAN_INLINE macro
nodejs · May 31, 2016 · 71819d8 · 71819d8
1 parent 7106130
commit 71819d8
Show file tree

Hide file tree

Showing 9 changed files with 306 additions and 312 deletions.
diff --git a/nan.h b/nan.h
diff --git a/nan_callbacks_pre_12_inl.h b/nan_callbacks_pre_12_inl.h
@@ -275,7 +275,7 @@ class ReturnValueImp : public ReturnValue<T> {
  public:
   explicit ReturnValueImp(ReturnValue<T> that) :
       ReturnValue<T>(that) {}
-  NAN_INLINE v8::Handle<T> Value() {
+  inline v8::Handle<T> Value() {
       return *ReturnValue<T>::value_;
   }
 };

diff --git a/nan_converters.h b/nan_converters.h
@@ -49,7 +49,7 @@ X(int32_t)
 }  // end of namespace imp
 
 template<typename T>
-NAN_INLINE
+inline
 typename imp::ToFactory<T>::return_t To(v8::Local<v8::Value> val) {
   return imp::ToFactory<T>::convert(val);
 }

diff --git a/nan_maybe_43_inl.h b/nan_maybe_43_inl.h
@@ -16,205 +16,205 @@ template<typename T>
 using Maybe = v8::Maybe<T>;
 
 template<typename T>
-NAN_INLINE Maybe<T> Nothing() {
+inline Maybe<T> Nothing() {
   return v8::Nothing<T>();
 }
 
 template<typename T>
-NAN_INLINE Maybe<T> Just(const T& t) {
+inline Maybe<T> Just(const T& t) {
   return v8::Just<T>(t);
 }
 
 v8::Local<v8::Context> GetCurrentContext();
 
-NAN_INLINE
+inline
 MaybeLocal<v8::String> ToDetailString(v8::Local<v8::Value> val) {
   return val->ToDetailString(GetCurrentContext());
 }
 
-NAN_INLINE
+inline
 MaybeLocal<v8::Uint32> ToArrayIndex(v8::Local<v8::Value> val) {
   return val->ToArrayIndex(GetCurrentContext());
 }
 
-NAN_INLINE
+inline
 Maybe<bool> Equals(v8::Local<v8::Value> a, v8::Local<v8::Value>(b)) {
   return a->Equals(GetCurrentContext(), b);
 }
 
-NAN_INLINE
+inline
 MaybeLocal<v8::Object> NewInstance(v8::Local<v8::Function> h) {
   return h->NewInstance(GetCurrentContext());
 }
 
-NAN_INLINE
+inline
 MaybeLocal<v8::Object> NewInstance(
       v8::Local<v8::Function> h
     , int argc
     , v8::Local<v8::Value> argv[]) {
   return h->NewInstance(GetCurrentContext(), argc, argv);
 }
 
-NAN_INLINE
+inline
 MaybeLocal<v8::Object> NewInstance(v8::Local<v8::ObjectTemplate> h) {
   return h->NewInstance(GetCurrentContext());
 }
 
 
-NAN_INLINE MaybeLocal<v8::Function> GetFunction(
+inline MaybeLocal<v8::Function> GetFunction(
     v8::Local<v8::FunctionTemplate> t) {
   return t->GetFunction(GetCurrentContext());
 }
 
-NAN_INLINE Maybe<bool> Set(
+inline Maybe<bool> Set(
     v8::Local<v8::Object> obj
   , v8::Local<v8::Value> key
   , v8::Local<v8::Value> value) {
   return obj->Set(GetCurrentContext(), key, value);
 }
 
-NAN_INLINE Maybe<bool> Set(
+inline Maybe<bool> Set(
     v8::Local<v8::Object> obj
   , uint32_t index
   , v8::Local<v8::Value> value) {
   return obj->Set(GetCurrentContext(), index, value);
 }
 
-NAN_INLINE Maybe<bool> ForceSet(
+inline Maybe<bool> ForceSet(
     v8::Local<v8::Object> obj
   , v8::Local<v8::Value> key
   , v8::Local<v8::Value> value
   , v8::PropertyAttribute attribs = v8::None) {
   return obj->ForceSet(GetCurrentContext(), key, value, attribs);
 }
 
-NAN_INLINE MaybeLocal<v8::Value> Get(
+inline MaybeLocal<v8::Value> Get(
     v8::Local<v8::Object> obj
   , v8::Local<v8::Value> key) {
   return obj->Get(GetCurrentContext(), key);
 }
 
-NAN_INLINE
+inline
 MaybeLocal<v8::Value> Get(v8::Local<v8::Object> obj, uint32_t index) {
   return obj->Get(GetCurrentContext(), index);
 }
 
-NAN_INLINE v8::PropertyAttribute GetPropertyAttributes(
+inline v8::PropertyAttribute GetPropertyAttributes(
     v8::Local<v8::Object> obj
   , v8::Local<v8::Value> key) {
   return obj->GetPropertyAttributes(GetCurrentContext(), key).FromJust();
 }
 
-NAN_INLINE Maybe<bool> Has(
+inline Maybe<bool> Has(
     v8::Local<v8::Object> obj
   , v8::Local<v8::String> key) {
   return obj->Has(GetCurrentContext(), key);
 }
 
-NAN_INLINE Maybe<bool> Has(v8::Local<v8::Object> obj, uint32_t index) {
+inline Maybe<bool> Has(v8::Local<v8::Object> obj, uint32_t index) {
   return obj->Has(GetCurrentContext(), index);
 }
 
-NAN_INLINE Maybe<bool> Delete(
+inline Maybe<bool> Delete(
     v8::Local<v8::Object> obj
   , v8::Local<v8::String> key) {
   return obj->Delete(GetCurrentContext(), key);
 }
 
-NAN_INLINE
+inline
 Maybe<bool> Delete(v8::Local<v8::Object> obj, uint32_t index) {
   return obj->Delete(GetCurrentContext(), index);
 }
 
-NAN_INLINE
+inline
 MaybeLocal<v8::Array> GetPropertyNames(v8::Local<v8::Object> obj) {
   return obj->GetPropertyNames(GetCurrentContext());
 }
 
-NAN_INLINE
+inline
 MaybeLocal<v8::Array> GetOwnPropertyNames(v8::Local<v8::Object> obj) {
   return obj->GetOwnPropertyNames(GetCurrentContext());
 }
 
-NAN_INLINE Maybe<bool> SetPrototype(
+inline Maybe<bool> SetPrototype(
     v8::Local<v8::Object> obj
   , v8::Local<v8::Value> prototype) {
   return obj->SetPrototype(GetCurrentContext(), prototype);
 }
 
-NAN_INLINE MaybeLocal<v8::String> ObjectProtoToString(
+inline MaybeLocal<v8::String> ObjectProtoToString(
     v8::Local<v8::Object> obj) {
   return obj->ObjectProtoToString(GetCurrentContext());
 }
 
-NAN_INLINE Maybe<bool> HasOwnProperty(
+inline Maybe<bool> HasOwnProperty(
     v8::Local<v8::Object> obj
   , v8::Local<v8::String> key) {
   return obj->HasOwnProperty(GetCurrentContext(), key);
 }
 
-NAN_INLINE Maybe<bool> HasRealNamedProperty(
+inline Maybe<bool> HasRealNamedProperty(
     v8::Local<v8::Object> obj
   , v8::Local<v8::String> key) {
   return obj->HasRealNamedProperty(GetCurrentContext(), key);
 }
 
-NAN_INLINE Maybe<bool> HasRealIndexedProperty(
+inline Maybe<bool> HasRealIndexedProperty(
     v8::Local<v8::Object> obj
   , uint32_t index) {
   return obj->HasRealIndexedProperty(GetCurrentContext(), index);
 }
 
-NAN_INLINE Maybe<bool> HasRealNamedCallbackProperty(
+inline Maybe<bool> HasRealNamedCallbackProperty(
     v8::Local<v8::Object> obj
   , v8::Local<v8::String> key) {
   return obj->HasRealNamedCallbackProperty(GetCurrentContext(), key);
 }
 
-NAN_INLINE MaybeLocal<v8::Value> GetRealNamedPropertyInPrototypeChain(
+inline MaybeLocal<v8::Value> GetRealNamedPropertyInPrototypeChain(
     v8::Local<v8::Object> obj
   , v8::Local<v8::String> key) {
   return obj->GetRealNamedPropertyInPrototypeChain(GetCurrentContext(), key);
 }
 
-NAN_INLINE MaybeLocal<v8::Value> GetRealNamedProperty(
+inline MaybeLocal<v8::Value> GetRealNamedProperty(
     v8::Local<v8::Object> obj
   , v8::Local<v8::String> key) {
   return obj->GetRealNamedProperty(GetCurrentContext(), key);
 }
 
-NAN_INLINE MaybeLocal<v8::Value> CallAsFunction(
+inline MaybeLocal<v8::Value> CallAsFunction(
     v8::Local<v8::Object> obj
   , v8::Local<v8::Object> recv
   , int argc
   , v8::Local<v8::Value> argv[]) {
   return obj->CallAsFunction(GetCurrentContext(), recv, argc, argv);
 }
 
-NAN_INLINE MaybeLocal<v8::Value> CallAsConstructor(
+inline MaybeLocal<v8::Value> CallAsConstructor(
     v8::Local<v8::Object> obj
   , int argc, v8::Local<v8::Value> argv[]) {
   return obj->CallAsConstructor(GetCurrentContext(), argc, argv);
 }
 
-NAN_INLINE
+inline
 MaybeLocal<v8::String> GetSourceLine(v8::Local<v8::Message> msg) {
   return msg->GetSourceLine(GetCurrentContext());
 }
 
-NAN_INLINE Maybe<int> GetLineNumber(v8::Local<v8::Message> msg) {
+inline Maybe<int> GetLineNumber(v8::Local<v8::Message> msg) {
   return msg->GetLineNumber(GetCurrentContext());
 }
 
-NAN_INLINE Maybe<int> GetStartColumn(v8::Local<v8::Message> msg) {
+inline Maybe<int> GetStartColumn(v8::Local<v8::Message> msg) {
   return msg->GetStartColumn(GetCurrentContext());
 }
 
-NAN_INLINE Maybe<int> GetEndColumn(v8::Local<v8::Message> msg) {
+inline Maybe<int> GetEndColumn(v8::Local<v8::Message> msg) {
   return msg->GetEndColumn(GetCurrentContext());
 }
 
-NAN_INLINE MaybeLocal<v8::Object> CloneElementAt(
+inline MaybeLocal<v8::Object> CloneElementAt(
     v8::Local<v8::Array> array
   , uint32_t index) {
 #if (NODE_MODULE_VERSION >= NODE_6_0_MODULE_VERSION)
@@ -234,7 +234,7 @@ NAN_INLINE MaybeLocal<v8::Object> CloneElementAt(
 #endif
 }
 
-NAN_INLINE MaybeLocal<v8::Value> Call(
+inline MaybeLocal<v8::Value> Call(
     v8::Local<v8::Function> fun
   , v8::Local<v8::Object> recv
   , int argc