Backed out changeset 641d968a9a7ed57a3b8a3f45dea43c5ee6717f97

2 files changed, 6 insertions, 15 deletions

diff --git a/Eigen/src/Core/NoAlias.h b/Eigen/src/Core/NoAlias.h
index 0542571e2..30ddbeb3c 100644
--- a/Eigen/src/Core/NoAlias.h
+++ b/Eigen/src/Core/NoAlias.h
@@ -45,18 +45,12 @@ class NoAlias
   public:
     NoAlias(ExpressionType& expression) : m_expression(expression) {}
 
-    /* \sa MatrixBase::lazyAssign() */
+    /** Behaves like MatrixBase::lazyAssign(other)
+      * \sa MatrixBase::lazyAssign() */
     template<typename OtherDerived>
     EIGEN_STRONG_INLINE ExpressionType& operator=(const StorageBase<OtherDerived>& other)
     { return m_expression.lazyAssign(other.derived()); }
 
-    template<typename OtherDerived>
-    EIGEN_STRONG_INLINE ExpressionType& operator=(const ReturnByValue<OtherDerived>& other)
-    {
-      other.evalTo(m_expression);
-      return m_expression;
-    }
-
     /** \sa MatrixBase::operator+= */
     template<typename OtherDerived>
     EIGEN_STRONG_INLINE ExpressionType& operator+=(const StorageBase<OtherDerived>& other)
diff --git a/Eigen/src/Core/ReturnByValue.h b/Eigen/src/Core/ReturnByValue.h
index b2e581c70..986bab54d 100644
--- a/Eigen/src/Core/ReturnByValue.h
+++ b/Eigen/src/Core/ReturnByValue.h
@@ -36,9 +36,9 @@ struct ei_traits<ReturnByValue<Derived> >
   enum {
     // We're disabling the DirectAccess because e.g. the constructor of
     // the Block-with-DirectAccess expression requires to have a coeffRef method.
-    // FIXME this should be fixed so we can have DirectAccessBit here.
+    // Also, we don't want to have to implement the stride stuff.
     Flags = (ei_traits<typename ei_traits<Derived>::ReturnType>::Flags
-             | EvalBeforeNestingBit | EvalBeforeAssigningBit) & ~DirectAccessBit
+             | EvalBeforeNestingBit) & ~DirectAccessBit
   };
 };
 
@@ -83,11 +83,8 @@ template<typename Derived>
 template<typename OtherDerived>
 Derived& DenseBase<Derived>::operator=(const ReturnByValue<OtherDerived>& other)
 {
-  // since we're by-passing the mechanisms in Assign.h, we implement here the EvalBeforeAssigningBit.
-  // override by using .noalias(), see corresponding operator= in NoAlias.
-  typename Derived::PlainObject result(rows(), cols());
-  other.evalTo(result);
-  return (derived() = result);
+  other.evalTo(derived());
+  return derived();
 }
 
 #endif // EIGEN_RETURNBYVALUE_H